diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2017-08-09 15:04:43 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-18 21:28:32 +0000 |
| commit | 2f743dc449b3d6445bb822107e1cca4230e946a4 (patch) | |
| tree | e7f2c75527a1b2cb94ffbc0134ea44c9939d5e3b | |
| parent | 82cad8431dcba9c19daeb2cc2b2f94ac580311e9 (diff) | |
| download | talos-openbmc-2f743dc449b3d6445bb822107e1cca4230e946a4.tar.gz talos-openbmc-2f743dc449b3d6445bb822107e1cca4230e946a4.zip | |
u-boot: Add MTD and UBI support to ast-g5
Add MTD and UBI support to the default g5 include, conditioned to
having MTDPARTS_DEFAULT defined.
This allows platforms to enable this support if desired without
adding it by default since it increases the size of u-boot.
Change-Id: Id6d95769a5e65f4f0f30238bf6a6ee2878c5a521
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
| -rw-r--r-- | meta-phosphor/common/recipes-bsp/u-boot/files/0003-Add-MTD-and-UBI-support-to-ast-g5.patch | 38 | ||||
| -rw-r--r-- | meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc | 3 |
2 files changed, 40 insertions, 1 deletions
diff --git a/meta-phosphor/common/recipes-bsp/u-boot/files/0003-Add-MTD-and-UBI-support-to-ast-g5.patch b/meta-phosphor/common/recipes-bsp/u-boot/files/0003-Add-MTD-and-UBI-support-to-ast-g5.patch new file mode 100644 index 000000000..dee4fd655 --- /dev/null +++ b/meta-phosphor/common/recipes-bsp/u-boot/files/0003-Add-MTD-and-UBI-support-to-ast-g5.patch @@ -0,0 +1,38 @@ +From 88f9b7ab5e2f99054b8f3a4173296e0cb9129067 Mon Sep 17 00:00:00 2001 +From: Adriana Kobylak <anoo@linux.vnet.ibm.com> +Date: Sun, 30 Jul 2017 16:13:43 -0500 +Subject: [PATCH u-boot v2016.07-aspeed-openbmc] Add MTD and UBI support to ast-g5 + +Add MTD and UBI support to the default g5 include, conditioned to +having MTDPARTS_DEFAULT defined. + +This allows platforms to enable this support if desired without +adding it by default since it increases the size of u-boot. + +Signed-off-by: Adriana Kobylak <anoo@linux.vnet.ibm.com> +--- + include/configs/ast-g5-ncsi.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/include/configs/ast-g5-ncsi.h b/include/configs/ast-g5-ncsi.h +index 12d6684..b126e6e 100644 +--- a/include/configs/ast-g5-ncsi.h ++++ b/include/configs/ast-g5-ncsi.h +@@ -28,4 +28,14 @@ + + #define CONFIG_HW_WATCHDOG + ++/* MTD and UBI */ ++#ifdef MTDPARTS_DEFAULT ++#define CONFIG_FLASH_CFI_MTD ++#define CONFIG_CMD_UBI ++#define CONFIG_RBTREE ++#define CONFIG_MTD_DEVICE ++#define CONFIG_MTD_PARTITIONS ++#define CONFIG_CMD_MTDPARTS ++#endif ++ + #endif /* __AST_G5_NCSI_CONFIG_H */ +-- +1.8.2.2 + 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 1eddea350..811df0bd4 100644 --- a/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc +++ b/meta-phosphor/common/recipes-bsp/u-boot/u-boot.inc @@ -6,7 +6,8 @@ SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=ht SRC_URI += "${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', \ 'file://0001-config-ast-common-hack-bootopts.patch \ - file://0002-Add-MTD-support-to-Aspeed-Flash-driver.patch', '', d)}" + file://0002-Add-MTD-support-to-Aspeed-Flash-driver.patch \ + file://0003-Add-MTD-and-UBI-support-to-ast-g5.patch', '', d)}" PV = "v2016.07+git${SRCPV}" |
