diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2017-07-27 13:32:33 -0500 |
|---|---|---|
| committer | Adriana Kobylak <anoo@us.ibm.com> | 2017-08-18 11:48:40 -0500 |
| commit | 470e25efc3fedbe2846acc77abba61524c1784a4 (patch) | |
| tree | 8eae4f321caa580bf30c0d99753b0ddecd9565bd /meta-phosphor/common/recipes-bsp/u-boot | |
| parent | a0dc87b2e45898974d59906957d69a0dbee88169 (diff) | |
| download | talos-openbmc-470e25efc3fedbe2846acc77abba61524c1784a4.tar.gz talos-openbmc-470e25efc3fedbe2846acc77abba61524c1784a4.zip | |
u-boot: modify boot options if obmc-ubi-fs enabled
Change-Id: I9b91ce8c540df347537544bbe5e8b5396aa2d3dc
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'meta-phosphor/common/recipes-bsp/u-boot')
| -rw-r--r-- | meta-phosphor/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch | 43 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc | 3 |
2 files changed, 46 insertions, 0 deletions
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch b/meta-phosphor/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch new file mode 100644 index 000000000..d168769fc --- /dev/null +++ b/meta-phosphor/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch @@ -0,0 +1,43 @@ +From 6bfd346da6639a83e17e271e95ce33d1d095334a Mon Sep 17 00:00:00 2001 +From: Patrick Williams <patrick@stwcx.xyz> +Date: Fri, 21 Jul 2017 16:30:01 -0500 +Subject: [PATCH] config/ast-common: hack bootopts + +Signed-off-by: Patrick Williams <patrick@stwcx.xyz> +--- + include/configs/ast-common.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h +index 110c780070..6f2a50b854 100644 +--- a/include/configs/ast-common.h ++++ b/include/configs/ast-common.h +@@ -84,7 +84,10 @@ + #define CONFIG_SYS_MAXARGS 16 + #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + ++#if 0 + #define CONFIG_BOOTARGS "console=ttyS4,115200n8 root=/dev/ram rw" ++#endif ++#define CONFIG_BOOTARGS "console=ttyS4,115200n8 root=/dev/mtdblock4 ro" + + #define CONFIG_AST_SPI_NOR /* AST SPI NOR Flash */ + #define CONFIG_FMC_CS 1 +@@ -96,11 +99,14 @@ + #define CONFIG_ENV_OFFSET 0x60000 /* environment starts here */ + #define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */ + ++#if 0 + #define CONFIG_BOOTCOMMAND \ + "fdt addr 20080000; " \ + "if fdt get value ramdisk_conf /configurations/conf@1 ramdisk; then " \ + " bootm 20080000; else bootm 20080000 20300000; " \ + "fi" ++#endif ++#define CONFIG_BOOTCOMMAND "fdt addr 20080000; bootm 20080000" + #define CONFIG_ENV_OVERWRITE + + #define ASPEED_ENV_SETTINGS \ +-- +2.13.0 + diff --git a/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc b/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc index 492e3f798..03b7a6130 100644 --- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc +++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc @@ -4,6 +4,9 @@ SRCREV = "a5e0a21ed4b62ab4d8ff09f70b751db0f46ddaac" UBRANCH = "v2016.07-aspeed-openbmc" SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https" +SRC_URI += "${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', \ + 'file://0001-config-ast-common-hack-bootopts.patch', '', d)}" + PV = "v2016.07+git${SRCPV}" SRC_URI += "file://0001-configs-ast-Add-redundnant-env.patch" |
