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>

7 files changed, 12 insertions, 13 deletions

diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass
index 21febe73d..8d19c80f5 100644
--- a/meta-phosphor/classes/image_types_phosphor.bbclass
+++ b/meta-phosphor/classes/image_types_phosphor.bbclass
@@ -145,10 +145,10 @@ do_generate_ubi() {
 	rm -f $cfg ubi-img
 
 	# Construct the ubinize config file
-	add_volume $cfg 0 static kernel0 \
+	add_volume $cfg 0 static kernel-0 \
 		${DEPLOY_DIR_IMAGE}/${FLASH_KERNEL_IMAGE}
 
-	add_volume $cfg 1 static rofs0 \
+	add_volume $cfg 1 static rofs-0 \
 		${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${FLASH_UBI_BASETYPE}
 
 	add_volume $cfg 2 dynamic rwfs rwfs.${FLASH_UBI_OVERLAY_BASETYPE} ${FLASH_UBI_RWFS_TXT_SIZE}
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" \
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
index d17ee5c36..a75badd73 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc
@@ -107,7 +107,7 @@ remount_ubi() {
       name="${name%Character*}"
       name="$(echo -e "${name}" | tr -d '[:space:]')"
 
-      if [[ ${name} == ro-* ]]; then
+      if [[ ${name} == rofs-* ]]; then
         mountdir="/media/${name}"
         mkdir -p "${mountdir}"
         ubiblock --create /dev/ubi${mtd}_${element} &> /dev/null
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
index 0ac9a430c..78975133d 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service
@@ -4,5 +4,5 @@ Description=Deletes read-only and kernel ubi volume %I
 [Service]
 Type=oneshot
 RemainAfterExit=no
-ExecStart={sbindir}/obmc-flash-bmc ubiremove ro-%i
+ExecStart={sbindir}/obmc-flash-bmc ubiremove rofs-%i
 ExecStart={sbindir}/obmc-flash-bmc ubiremove kernel-%i
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
index 4dec96efb..2d7b70335 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service
@@ -4,5 +4,5 @@ Description=Create read-only ubi volumes %I
 [Service]
 Type=oneshot
 RemainAfterExit=no
-ExecStart={sbindir}/obmc-flash-bmc ubiro {RO_MTD} ro-%i %i
+ExecStart={sbindir}/obmc-flash-bmc ubiro {RO_MTD} rofs-%i %i
 ExecStart={sbindir}/obmc-flash-bmc ubikernel {KERNEL_MTD} kernel-%i %i
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
index 71a652bb4..c57040ea7 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service
@@ -4,4 +4,4 @@ Description=Deletes BMC read-write ubi volume
 [Service]
 Type=oneshot
 RemainAfterExit=no
-ExecStart={sbindir}/obmc-flash-bmc ubiremove rw
+ExecStart={sbindir}/obmc-flash-bmc ubiremove rwfs
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
index cef57e008..07820fb27 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service
@@ -4,4 +4,4 @@ Description=Create BMC read-write ubi volume
 [Service]
 Type=oneshot
 RemainAfterExit=no
-ExecStart={sbindir}/obmc-flash-bmc ubirw {RW_MTD} rw
+ExecStart={sbindir}/obmc-flash-bmc ubirw {RW_MTD} rwfs