From 009aad16455be2d6f7c064c93bde7ffe843a1d14 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 21 Aug 2019 15:55:34 +0930 Subject: aspeed-u-boot-sdk: Bump to latest dev commit This includes a fix to the bootm limit issue so the patch can be removed. It also addresses other issues, such as an updated SMP handshake and booting larger kernels. (From meta-aspeed rev: 921779183e3d57dbfddc9179f6b8fc413b453553) Change-Id: I5575ac0a7d0f72fa97b3aa6c580bdacc84ac619d Signed-off-by: Joel Stanley Signed-off-by: Brad Bishop --- .../files/0001-aspeed-Limit-bootm-memory.patch | 31 ---------------------- .../u-boot/u-boot-common-aspeed-sdk_2019.04.inc | 5 ++-- 2 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 meta-aspeed/recipes-bsp/u-boot/files/0001-aspeed-Limit-bootm-memory.patch diff --git a/meta-aspeed/recipes-bsp/u-boot/files/0001-aspeed-Limit-bootm-memory.patch b/meta-aspeed/recipes-bsp/u-boot/files/0001-aspeed-Limit-bootm-memory.patch deleted file mode 100644 index f6062971c..000000000 --- a/meta-aspeed/recipes-bsp/u-boot/files/0001-aspeed-Limit-bootm-memory.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 41d6940891b91e27ea5509eda2247811a3ba0c0d Mon Sep 17 00:00:00 2001 -From: Joel Stanley -Date: Tue, 30 Jul 2019 15:52:05 +0930 -Subject: [PATCH] aspeed: Limit bootm memory - -This ensures u-boot places the kernel, device tree and initrd at an -address that is accessible by the Linux early boot code. - -Without this, when booting with FIT the device tree is placed at the end -of RAM which is not mapped on the AST2600 EVB which contains 2GB of RAM. - -Signed-off-by: Joel Stanley ---- - include/configs/aspeed-common.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h -index 3b345ba46333..eba4e1c79d80 100644 ---- a/include/configs/aspeed-common.h -+++ b/include/configs/aspeed-common.h -@@ -41,6 +41,7 @@ - #define CONFIG_SYS_INIT_SP_ADDR \ - (SYS_INIT_RAM_END - GENERATED_GBL_DATA_SIZE) - -+#define CONFIG_SYS_BOOTMAPSZ (256 * 1024 * 1024) - #define CONFIG_SYS_MALLOC_LEN (32 << 20) - - /* --- -2.20.1 - diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index 7aa879cdf..bef544851 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc @@ -8,11 +8,10 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "d8ebf49e584e4e134bd8d1c445ef2da276a00e1a" +SRCREV = "3d624802e82868bc5c2b6314cdff7499d8441761" -UBRANCH = "aspeed-master-v2019.04" +UBRANCH = "aspeed-dev-v2019.04" SRC_URI = "git://github.com/AspeedTech-BMC/u-boot;branch=${UBRANCH};protocol=https" -SRC_URI += "file://0001-aspeed-Limit-bootm-memory.patch" S = "${WORKDIR}/git" -- cgit v1.2.3