nezha_defconfig: bump u-boot to current top of d1-wip
PATCH 1/4 nezha_defconfig: bump u-boot to current top of d1-wip
This is now based on U-Boot 2022.10 and has gained SPL support, so use that instead of sun20-d1-spl. With this we can also drop the u-boot patch and patch directory.
--- board/nezha/genimage.cfg | 26 ++------- ...pport-building-u-boot.toc1-for-nezda.patch | 54 ------------------- configs/nezha_defconfig | 7 +-- 3 files changed, 6 insertions(+), 81 deletions(-) delete mode 100644 board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch
board/nezha/genimage.cfg +4 -22
@@ -4,34 +4,16 @@ image sdcard.img { hdimage { } - partition boot0-1 { - in-partition-table = "no" - image = "boot0_sdcard_sun20iw1p1.bin" + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" offset = 8K } - partition boot0-2 { - in-partition-table = "no" - image = "boot0_sdcard_sun20iw1p1.bin" - offset = 128K - } - - partition u-boot-1 { - in-partition-table = "no" - image = "u-boot.toc1" - offset = 12M - } - - partition u-boot-2 { - in-partition-table = "no" - image = "u-boot.toc1" - offset = 16400K - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext4" bootable = "true" - offset = 18M + offset = 1M } }
board/nezha/patches/uboot/0001-Makefile-HACK-Support-building-u-boot.toc1-for-nezda.patch deleted +0 -54
54 lines not on this page · raw message
configs/nezha_defconfig +2 -5
@@ -1,5 +1,4 @@ BR2_riscv=y -BR2_GLOBAL_PATCH_DIR="board/nezha/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay"
@@ -20,18 +19,16 @@ BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,opensbi,e6793dc36a71537023f078034fe795c64a9992a3)/opensbi-e6793dc36a71537023f078034fe795c64a9992a3.tar.gz" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set -BR2_TARGET_SUN20I_D1_SPL=y 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,smaeul,u-boot,d1-2022-05-26)/uboot-d1-2022-05-26.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,u-boot,528ae9bc6c55edd3ffe642734b4132a8246ea777)/uboot-528ae9bc6c55edd3ffe642734b4132a8246ea777.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nezha" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_OPENSBI=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.toc1" +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y
Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 2/4 nezha_defconfig: use upstream OpenSBI 1.1 release
The D1 support is now upstream, so we can use the upstream 1.1 release instead of a custom version.
--- configs/nezha_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
configs/nezha_defconfig +2 -2
@@ -15,8 +15,8 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y -BR2_TARGET_OPENSBI_CUSTOM_TARBALL=y -BR2_TARGET_OPENSBI_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,opensbi,e6793dc36a71537023f078034fe795c64a9992a3)/opensbi-e6793dc36a71537023f078034fe795c64a9992a3.tar.gz" +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.1" BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y
Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH 2/4] nezha_defconfig: use upstream OpenSBI 1.1 release
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
The D1 support is now upstream, so we can use the upstream 1.1 release instead of a custom version.
Signed-off-by Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 3/4 nezha_defconfig: bump Linux to current top of d1/wip
In reply to Peter KorsgaardThis is now based on Linux 6.1-rc3. We don't have an option for 6.1 yes, so mark it as 6.0 headers.
--- configs/nezha_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
configs/nezha_defconfig +2 -2
@@ -1,12 +1,12 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_19=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/nezha/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/nezha/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,fe178cf0153d98b71cb01a46c8cc050826a17e77)/linux-fe178cf0153d98b71cb01a46c8cc050826a17e77.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="nezha" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-nezha"
Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH 3/4] nezha_defconfig: bump Linux to current top of d1/wip
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
This is now based on Linux 6.1-rc3. We don't have an option for 6.1 yes, so mark it as 6.0 headers.
Signed-off-by Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH 4/4 boot/sun20i-d1-spl: drop package
In reply to Peter KorsgaardU-Boot has now gained SPL support for D1, so this temporary bootloader is no longer supported.
--- Config.in.legacy | 7 +++++++ DEVELOPERS | 1 - boot/Config.in | 1 - boot/sun20i-d1-spl/Config.in | 8 -------- boot/sun20i-d1-spl/sun20i-d1-spl.hash | 2 -- boot/sun20i-d1-spl/sun20i-d1-spl.mk | 23 ----------------------- 6 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 boot/sun20i-d1-spl/Config.in delete mode 100644 boot/sun20i-d1-spl/sun20i-d1-spl.hash delete mode 100644 boot/sun20i-d1-spl/sun20i-d1-spl.mk
Config.in.legacy +7 -0
@@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.02" +config BR2_TARGET_SUN20I_D1_SPL + bool "sun20-d1-spl removed" + select BR2_LEGACY + help + U-Boot has gained SPL support for D1, so this temporary + bootloader is no longer supported. + config BR2_KERNEL_HEADERS_5_19 bool "kernel headers version 5.19.x are no longer supported" select BR2_LEGACY
DEVELOPERS +0 -1
@@ -2300,7 +2300,6 @@ F: board/pandaboard/ F: board/roseapplepi/ F: board/visionfive/ F: boot/shim/ -F: boot/sun20i-d1-spl/ F: configs/avenger96_defconfig F: configs/beagleboneai_defconfig F: configs/lafrite_defconfig
boot/Config.in +0 -1
@@ -20,7 +20,6 @@ source "boot/optee-os/Config.in" source "boot/opensbi/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" -source "boot/sun20i-d1-spl/Config.in" source "boot/syslinux/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in"
boot/sun20i-d1-spl/Config.in deleted +0 -8
@@ -1,8 +0,0 @@ -config BR2_TARGET_SUN20I_D1_SPL - bool "sun20-d1-spl" - depends on BR2_RISCV_64 - help - Allwinner D1 boot0 code with modifications to use as U-Boot - SPL. - - https://github.com/smaeul/sun20i_d1_spl
boot/sun20i-d1-spl/sun20i-d1-spl.hash deleted +0 -2
@@ -1,2 +0,0 @@ -# Locally computed -sha256 08e2d0574e58c99734cd1d9ea89b86464242bf2db4f6769b23803bf9dcdac3c4 sun20i-d1-spl-882671fcf53137aaafc3a94fa32e682cb7b921f1.tar.gz
boot/sun20i-d1-spl/sun20i-d1-spl.mk deleted +0 -23
@@ -1,23 +0,0 @@ -################################################################################ -# -# sun20i-d1-spl -# -################################################################################ - -# Commit on the 'mainline' branch -SUN20I_D1_SPL_VERSION = 882671fcf53137aaafc3a94fa32e682cb7b921f1 -SUN20I_D1_SPL_SITE = $(call github,smaeul,sun20i_d1_spl,$(SUN20I_D1_SPL_VERSION)) -SUN20I_D1_SPL_INSTALL_TARGET = NO -SUN20I_D1_SPL_INSTALL_IMAGES = YES -SUN20I_D1_SPL_LICENSE = GPL-2.0+ - -define SUN20I_D1_SPL_BUILD_CMDS - $(MAKE) -C $(@D) CROSS_COMPILE="$(TARGET_CROSS)" p=sun20iw1p1 mmc -endef - -define SUN20I_D1_SPL_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/nboot/boot0_sdcard_sun20iw1p1.bin \ - $(BINARIES_DIR)/boot0_sdcard_sun20iw1p1.bin -endef - -$(eval $(generic-package))
Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Re: [Buildroot] [PATCH 4/4] boot/sun20i-d1-spl: drop package
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
U-Boot has now gained SPL support for D1, so this temporary bootloader is no longer supported.
Signed-off-by Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
This is now based on U-Boot 2022.10 and has gained SPL support, so use that instead of sun20-d1-spl. With this we can also drop the u-boot patch and patch directory.
Signed-off-by Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot