From 1a04b621baf9585f0021eb939b4b2f560563c654 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 28 Jan 2020 17:12:44 +1030 Subject: u-boot-sdk: Use OpenBMC fork This is a fork that is based on ASPEED's 2019.04 SDK fork. The goal is to move to a mainline based tree, but while that work is underway, this allows ast2600 support to move forward. This gains support for NC-SI, and uses kconfig for the default boot command allowing us to drop the patch to aspeed-common.h. Machines will need to indicate which device tree to use. If possible we should look to having a few common device trees, but for now they are machine specific. The AST2600 is configured to use the ast2600a1-evb device tree, which will also work on the a0 variant. (From meta-aspeed rev: 22ccf4648a776c458300c97a6d001a843b2b5c9b) Change-Id: Ib21dc9962761aac3f3148fe4908439b975545e1e Signed-off-by: Joel Stanley Signed-off-by: Andrew Geissler --- ...vb-ast2600-put-environment-back-at-512KiB.patch | 47 ---------------------- 1 file changed, 47 deletions(-) delete mode 100644 meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch (limited to 'meta-aspeed/recipes-bsp/u-boot/files') diff --git a/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch b/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch deleted file mode 100644 index e010f26c1..000000000 --- a/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2add5b8d1216be2e446a3d707767c2a5ec6be9f4 Mon Sep 17 00:00:00 2001 -From: Brad Bishop -Date: Thu, 5 Sep 2019 20:39:57 -0400 -Subject: [PATCH u-boot aspeed-dev-v2019.04] arm: evb-ast2600: put environment - back at 512KiB - -Prior to 473f430b90 the environment was at 512KiB, and compatible with -OpenBMC. Restore OpenBMC compatibility by moving the environment back -to 512KiB. - -Signed-off-by: Brad Bishop ---- - include/configs/aspeed-common.h | 4 +++- - include/configs/evb_ast2600.h | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h -index 7a730d17ad..d1eb4688e6 100644 ---- a/include/configs/aspeed-common.h -+++ b/include/configs/aspeed-common.h -@@ -52,7 +52,9 @@ - /* - * Miscellaneous configurable options - */ --#define CONFIG_BOOTCOMMAND "bootm 200a0000" -+#ifndef CONFIG_BOOTCOMMAND -+#define CONFIG_BOOTCOMMAND "bootm 20080000" -+#endif - #define CONFIG_ENV_OVERWRITE - - #define CONFIG_SYS_BOOTM_LEN (0x800000 * 2) -diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h -index b4de42a05a..3a12f2f0d4 100644 ---- a/include/configs/evb_ast2600.h -+++ b/include/configs/evb_ast2600.h -@@ -18,7 +18,7 @@ - - /* Environment */ - #define CONFIG_ENV_SIZE 0x10000 --#define CONFIG_ENV_OFFSET 0x90000 -+#define CONFIG_ENV_OFFSET 0x60000 - #define CONFIG_ENV_SECT_SIZE (4 << 10) - - #endif /* __CONFIG_H */ --- -2.21.0 - -- cgit v1.2.3 From 52db5ae2099ba766ec53a034c38e8b1fea7f07c7 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 20 Mar 2020 12:17:07 +1030 Subject: u-boot-aspeed: Fix fw_env.config for ast2600 The configuration was not set at all, leaving us with the default configuration file from u-boot. This sets it to the u-boot environment partition, /dev/mtd2. (From meta-aspeed rev: fc48e308dd25b99535a5412cbbdf1fcd66238a9b) Change-Id: Ied346a6c15f0068b8ab54cec02bc89bf9e553127 Signed-off-by: Joel Stanley Signed-off-by: Andrew Geissler --- meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config | 2 ++ meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config (limited to 'meta-aspeed/recipes-bsp/u-boot/files') diff --git a/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config b/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config new file mode 100644 index 000000000..ccd037ee6 --- /dev/null +++ b/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config @@ -0,0 +1,2 @@ +# MTD device name Device offset Env. size Flash sector size Number of sectors +/dev/mtd/u-boot-env 0x0000 0x10000 0x1000 diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb index 59fdbdeab..821457901 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb @@ -5,6 +5,8 @@ DEPENDS += "mtd-utils" PROVIDES += "u-boot-fw-utils" +SRC_URI += "file://fw_env_ast2600_nor.config" + INSANE_SKIP_${PN} = "already-stripped" EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1' EXTRA_OEMAKE_class-cross = 'HOSTCC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' @@ -21,7 +23,7 @@ do_install () { install -d ${D}${sysconfdir} install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv - install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config + install -m 644 ${WORKDIR}/fw_env_ast2600_nor.config ${D}${sysconfdir}/fw_env.config } do_install_class-cross () { -- cgit v1.2.3