| Message ID | 20240112194000.925982-2-m.niestroj@grinn-global.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] configs/orangepi_zero3: bump ARM Trusted Firmware to 2.10 | expand |
Hi, Marcin Niestroj, Thanks for the update! Tested-by: Sergey Kuzminov <kuzminov.sergey81@gmail.com> 12.01.2024 22:39, Marcin Niestroj пишет: > There is now support in both upstream U-Boot and upstream Linux. > > Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com> > --- > board/orangepi/orangepi-zero3/linux.config | 1 - > configs/orangepi_zero3_defconfig | 17 ++++++++--------- > 2 files changed, 8 insertions(+), 10 deletions(-) > delete mode 100644 board/orangepi/orangepi-zero3/linux.config > > diff --git a/board/orangepi/orangepi-zero3/linux.config b/board/orangepi/orangepi-zero3/linux.config > deleted file mode 100644 > index 09b7a93a5a..0000000000 > --- a/board/orangepi/orangepi-zero3/linux.config > +++ /dev/null > @@ -1 +0,0 @@ > -CONFIG_MFD_AC200=y > diff --git a/configs/orangepi_zero3_defconfig b/configs/orangepi_zero3_defconfig > index f4fbf86812..93d53dc301 100644 > --- a/configs/orangepi_zero3_defconfig > +++ b/configs/orangepi_zero3_defconfig > @@ -2,7 +2,7 @@ BR2_aarch64=y > BR2_cortex_a53=y > BR2_ARM_FPU_VFPV4=y > > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y > BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > BR2_SYSTEM_DHCP="eth0" > > @@ -16,8 +16,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > # Bootloader > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y > -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,orangepi-xunlong,u-boot-orangepi,6fe17fac388aad17490cf386578b7532975e567f)/u-boot-orangepi-6fe17fac388aad17490cf386578b7532975e567f.tar.gz" > +BR2_TARGET_UBOOT_CUSTOM_VERSION=y > +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" > BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero3" > BR2_TARGET_UBOOT_NEEDS_DTC=y > BR2_TARGET_UBOOT_NEEDS_OPENSSL=y > @@ -30,21 +30,20 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" > > # Kernel > BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y > -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,orangepi-xunlong,linux-orangepi,3495b5ee0594566c9fed930b96b1cae90600412e)/linux-orangepi-3495b5ee0594566c9fed930b96b1cae90600412e.tar.gz" > -BR2_LINUX_KERNEL_DEFCONFIG="linux_sunxi64" > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > BR2_LINUX_KERNEL_DTS_SUPPORT=y > -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h616-orangepi-zero3" > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h618-orangepi-zero3" > BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > BR2_LINUX_KERNEL_INSTALL_TARGET=y > BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero3/linux.config" > > # Filesystem > BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero3" > BR2_TARGET_ROOTFS_EXT2=y > BR2_TARGET_ROOTFS_EXT2_4=y > -BR2_TARGET_ROOTFS_EXT2_SIZE="180M" > +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" > # BR2_TARGET_ROOTFS_TAR is not set > > # host tools
>>>>> "Marcin" == Marcin Niestroj <m.niestroj@grinn-global.com> writes: > There is now support in both upstream U-Boot and upstream Linux. > Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com> Committed, thanks.
diff --git a/board/orangepi/orangepi-zero3/linux.config b/board/orangepi/orangepi-zero3/linux.config deleted file mode 100644 index 09b7a93a5a..0000000000 --- a/board/orangepi/orangepi-zero3/linux.config +++ /dev/null @@ -1 +0,0 @@ -CONFIG_MFD_AC200=y diff --git a/configs/orangepi_zero3_defconfig b/configs/orangepi_zero3_defconfig index f4fbf86812..93d53dc301 100644 --- a/configs/orangepi_zero3_defconfig +++ b/configs/orangepi_zero3_defconfig @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" @@ -16,8 +16,8 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,orangepi-xunlong,u-boot-orangepi,6fe17fac388aad17490cf386578b7532975e567f)/u-boot-orangepi-6fe17fac388aad17490cf386578b7532975e567f.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero3" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -30,21 +30,20 @@ BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" # Kernel BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,orangepi-xunlong,linux-orangepi,3495b5ee0594566c9fed930b96b1cae90600412e)/linux-orangepi-3495b5ee0594566c9fed930b96b1cae90600412e.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="linux_sunxi64" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.7" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h616-orangepi-zero3" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h618-orangepi-zero3" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_DTB_KEEP_DIRNAME=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero3/linux.config" # Filesystem BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero3" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="180M" +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set # host tools
There is now support in both upstream U-Boot and upstream Linux. Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com> --- board/orangepi/orangepi-zero3/linux.config | 1 - configs/orangepi_zero3_defconfig | 17 ++++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 board/orangepi/orangepi-zero3/linux.config