diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2017-08-24 17:33:35 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-28 19:49:54 +0300 |
| commit | 9ac92c41adc78f4cbd03edf20423c4fc8d8bd92f (patch) | |
| tree | f86cb733932d770ae0efed7197aff42a4c125251 | |
| parent | a13445305497926ce4d348eb284b5d479600d624 (diff) | |
| download | openbmc-9ac92c41adc78f4cbd03edf20423c4fc8d8bd92f.tar.xz | |
u-boot: Rebase openbmc patches
Rebase u-boot patches since the ast-common.h has been updated upstream.
Change-Id: I70ac5f32d1bf1d6572c06fcc6c32bd2c0f6a177f
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
| -rw-r--r-- | meta-phosphor/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch | 10 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-ubi-bootops.patch | 16 |
2 files changed, 15 insertions, 11 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 index f0895cec8..a5765e956 100644 --- 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 @@ -9,12 +9,12 @@ Signed-off-by: Patrick Williams <patrick@stwcx.xyz> 1 file changed, 6 insertions(+) diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h -index 15e1db4..e7fa6ed 100644 +index 0475109..8dfaff7 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 +@@ -96,7 +96,10 @@ + #define CONFIG_CMD_MTDPARTS + #endif +#if 0 #define CONFIG_BOOTARGS "console=ttyS4,115200n8 root=/dev/ram rw" @@ -23,7 +23,7 @@ index 15e1db4..e7fa6ed 100644 #define CONFIG_AST_SPI_NOR /* AST SPI NOR Flash */ #define CONFIG_FMC_CS 1 -@@ -99,11 +102,14 @@ +@@ -111,11 +114,14 @@ #define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #define CONFIG_ENV_SIZE_REDUND 0x10000 diff --git a/meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-ubi-bootops.patch b/meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-ubi-bootops.patch index 012ed5b43..d026e9620 100644 --- a/meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-ubi-bootops.patch +++ b/meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-ubi-bootops.patch @@ -9,19 +9,23 @@ Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h -index e7fa6ed..1f0e64e 100644 +index 8dfaff7..8150265 100644 --- a/include/configs/ast-common.h +++ b/include/configs/ast-common.h -@@ -84,10 +84,16 @@ - #define CONFIG_SYS_MAXARGS 16 +@@ -85,6 +85,12 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -+/* + /* + * Dynamic MTD Partition support + */ +#define MTDIDS_DEFAULT "nor0=bmc" +#define MTDPARTS_DEFAULT "mtdparts=bmc:384k(u-boot),128k(u-boot-env),-(obmc-ubi)" + ++/* + * Optional MTD and UBI support + */ + #ifdef MTDPARTS_DEFAULT +@@ -99,7 +105,7 @@ #if 0 #define CONFIG_BOOTARGS "console=ttyS4,115200n8 root=/dev/ram rw" #endif @@ -30,7 +34,7 @@ index e7fa6ed..1f0e64e 100644 #define CONFIG_AST_SPI_NOR /* AST SPI NOR Flash */ #define CONFIG_FMC_CS 1 -@@ -96,6 +102,7 @@ +@@ -108,6 +114,7 @@ #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_ADDR (AST_FMC_CS0_BASE + 0x60000) #define CONFIG_ENV_ADDR_REDUND (AST_FMC_CS0_BASE + 0x70000) @@ -38,7 +42,7 @@ index e7fa6ed..1f0e64e 100644 #define CONFIG_ENV_OFFSET 0x60000 /* environment starts here */ #define CONFIG_ENV_OFFSET_REDUND 0x70000 -@@ -109,12 +116,20 @@ +@@ -121,12 +128,20 @@ " bootm 20080000; else bootm 20080000 20300000; " \ "fi" #endif |