diff --git a/.checkpackageignore b/.checkpackageignore index 6fbc66b15d..ad0937eefb 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1,6 +1,4 @@ board/amarula/vyasa/post-build.sh Shellcheck -board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch lib_patch.Upstream -board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch lib_patch.Upstream board/arcturus/aarch64-ucls1012a/post-build.sh Shellcheck board/arcturus/aarch64-ucls1012a/post-image.sh Shellcheck board/aspeed/common/post-image.sh Shellcheck diff --git a/board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch b/board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch deleted file mode 100644 index be89a1563f..0000000000 --- a/board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 16aad5594e08550295ea3c12c1c9ed6f64774748 Mon Sep 17 00:00:00 2001 -From: Rick Chen -Date: Tue, 29 Mar 2022 13:41:10 +0800 -Subject: [PATCH] mmc: ftsdc010_mci: Support DTS of ftsdc010 driver for - generic dma - -The ftsdc010 driver has been implemented for generic dma in Linux -kernel. And its compatible is andestech,atfsdc010g to distinguish -the legacy andestech,atfsdc010 which is not for generic dma. - -Althought the ftsdc010_mci driver in U-Boot does not use dma, but -it still can work well with the mmc node for generic dma. So add -the compatible string to support it. - -Signed-off-by: Rick Chen - -Upstream-Status: Pending - -Signed-off-by: Yu Chien Peter Lin ---- - drivers/mmc/ftsdc010_mci.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c -index 570d54cf9d..65b1d447a8 100644 ---- a/drivers/mmc/ftsdc010_mci.c -+++ b/drivers/mmc/ftsdc010_mci.c -@@ -460,6 +460,7 @@ int ftsdc010_mmc_bind(struct udevice *dev) - - static const struct udevice_id ftsdc010_mmc_ids[] = { - { .compatible = "andestech,atfsdc010" }, -+ { .compatible = "andestech,atfsdc010g" }, - { } - }; - --- -2.34.1 - diff --git a/board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch b/board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch deleted file mode 100644 index 5080554ca1..0000000000 --- a/board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 933ad8a59f7fd9b2088badc3e97167d750a40b5a Mon Sep 17 00:00:00 2001 -From: Bin Meng -Date: Mon, 12 Jul 2021 11:52:31 +0800 -Subject: [PATCH] spl: Align device tree blob address at 8-byte boundary - -Since libfdt v1.6.1, a new requirement on the device tree address via: - - commit 5e735860c478 ("libfdt: Check for 8-byte address alignment in fdt_ro_probe_()") - -must be met that the device tree must be loaded in to memory at an -8-byte aligned address. - -Signed-off-by: Bin Meng - -This patch was imported from U-boot patchwork: -https://patchwork.ozlabs.org/project/uboot/patch/20210712035231.26475-1-bmeng.cn@gmail.com/ - -Signed-off-by: Yu Chien Peter Lin ---- - common/spl/spl_fit.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c -index a35be529..a76ad14a 100644 ---- a/common/spl/spl_fit.c -+++ b/common/spl/spl_fit.c -@@ -382,6 +382,12 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, - */ - image_info.load_addr = spl_image->load_addr + spl_image->size; - -+ /* -+ * Since libfdt v1.6.1, the device tree must be loaded in to memory -+ * at an 8-byte aligned address. -+ */ -+ image_info.load_addr = roundup(image_info.load_addr, 8); -+ - /* Figure out which device tree the board wants to use */ - node = spl_fit_get_image_node(ctx, FIT_FDT_PROP, index++); - if (node < 0) { --- -2.34.1 - diff --git a/board/andes/ae350/patches/uboot/uboot.hash b/board/andes/ae350/patches/uboot/uboot.hash new file mode 100644 index 0000000000..440526977b --- /dev/null +++ b/board/andes/ae350/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 0f933f6c5a426895bf306e93e6ac53c60870e4b54cda56d95211bec99e63bec7 u-boot-2025.07.tar.bz2 diff --git a/configs/andes_ae350_45_defconfig b/configs/andes_ae350_45_defconfig index aafa447379..5e8ea5468d 100644 --- a/configs/andes_ae350_45_defconfig +++ b/configs/andes_ae350_45_defconfig @@ -23,12 +23,13 @@ BR2_TARGET_OPENSBI_PLAT="generic" # BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set 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,u-boot,u-boot,a5dfa3b8a0f7ad555495bad1386613d2de4ba619)/u-boot-a5dfa3b8a0f7ad555495bad1386613d2de4ba619.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ae350_rv64_spl_xip" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/andes/ae350/uboot.config.fragment" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_NEEDS_OPENSBI=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_CUSTOM=y