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>
diff --git a/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch b/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch
index f0895ce..a5765e9 100644
--- a/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch
+++ b/common/recipes-bsp/u-boot/files/0001-config-ast-common-hack-bootopts.patch
@@ -9,12 +9,12 @@
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 @@
#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/common/recipes-bsp/u-boot/files/0004-config-ast-common-ubi-bootops.patch b/common/recipes-bsp/u-boot/files/0004-config-ast-common-ubi-bootops.patch
index 012ed5b..d026e96 100644
--- a/common/recipes-bsp/u-boot/files/0004-config-ast-common-ubi-bootops.patch
+++ b/common/recipes-bsp/u-boot/files/0004-config-ast-common-ubi-bootops.patch
@@ -9,19 +9,23 @@
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 @@
#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 @@
#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