diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2017-08-21 11:00:56 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-24 02:42:25 +0000 |
| commit | 4c2576ab9e4e85e71419137c1a00bdc2ea1337cf (patch) | |
| tree | 1db1e1af017bf3cb049ce1fc39180229bf31072b /meta-phosphor/common/recipes-bsp | |
| parent | b0396780f9cc141d2fc4613cbfcd4ca17d2a1db1 (diff) | |
| download | talos-openbmc-4c2576ab9e4e85e71419137c1a00bdc2ea1337cf.tar.gz talos-openbmc-4c2576ab9e4e85e71419137c1a00bdc2ea1337cf.zip | |
BMC: Make volume names consistent
Name the BMC volume names consistently in the build process and
applications to be <name>-<id> for readability. For names, use
rofs and rwfs instead of ro and rw.
Change-Id: I860f740fb7d0292e4ee09493730db1d1f67c2ae5
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-bsp')
| -rw-r--r-- | meta-phosphor/common/recipes-bsp/u-boot/files/0004-config-ast-common-ubi-bootops.patch | 11 |
1 files changed, 5 insertions, 6 deletions
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 4e465ced5..012ed5b43 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 @@ -5,11 +5,11 @@ Subject: [PATCH] config/ast-common: Add bootopts to support ubi and mtd partitio Signed-off-by: Adriana Kobylak <anoo@us.ibm.com> --- - include/configs/ast-common.h | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) + include/configs/ast-common.h | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h -index e7fa6ed..578de2c 100644 +index e7fa6ed..1f0e64e 100644 --- a/include/configs/ast-common.h +++ b/include/configs/ast-common.h @@ -84,10 +84,16 @@ @@ -38,7 +38,7 @@ index e7fa6ed..578de2c 100644 #define CONFIG_ENV_OFFSET 0x60000 /* environment starts here */ #define CONFIG_ENV_OFFSET_REDUND 0x70000 -@@ -109,12 +116,21 @@ +@@ -109,12 +116,20 @@ " bootm 20080000; else bootm 20080000 20300000; " \ "fi" #endif @@ -49,8 +49,7 @@ index e7fa6ed..578de2c 100644 #define ASPEED_ENV_SETTINGS \ + "ubiblock=0,1 \0" \ + "root=/dev/ubiblock0_1 \0" \ -+ "kernelname=kernel0 \0" \ -+ "kernelname=kernel0 \0" \ ++ "kernelname=kernel-0 \0" \ + "loadaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "set_bootargs=setenv bootargs " CONFIG_BOOTARGS " ubi.block=\${ubiblock} root=\${root} \0" \ + "obmc_bootcmd=ubi part obmc-ubi; ubi read ${loadaddr} ${kernelname}; bootm ${loadaddr} \0" \ |
