libffs: Standardise ffs partition flags

It seems we've developed a character respresentation for ffs partition
flags. Currently only pflash really prints them so it hasn't been a
problem but now ffspart wants to read them in from user input.

It is important that what libffs reads and what pflash prints remain
consistent, we should move the code into libffs to avoid problems.

Signed-off-by: Cyril Bur <cyril.bur@au1.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>

6 files changed, 8 insertions, 8 deletions

diff --git a/external/ffspart/ffspart.c b/external/ffspart/ffspart.c
index 309f9b6..350d78b 100644
--- a/external/ffspart/ffspart.c
+++ b/external/ffspart/ffspart.c
@@ -284,7 +284,7 @@ int main(int argc, char *argv[])
 			case 'E':
 				user.datainteg |= FFS_ENRY_INTEG_ECC;
 				break;
-			case 'V':
+			case 'L':
 				user.vercheck |= FFS_VERCHECK_SHA512V;
 				break;
 			case 'I':
@@ -299,7 +299,7 @@ int main(int argc, char *argv[])
 			case 'F':
 				user.miscflags |= FFS_MISCFLAGS_REPROVISION;
 				break;
-			case 'L':
+			case 'V':
 				user.miscflags |= FFS_MISCFLAGS_VOLATILE;
 				break;
 			case 'C':
diff --git a/external/ffspart/test/files/03-tiny-pnor.in b/external/ffspart/test/files/03-tiny-pnor.in
index 3c02b02..4fe1d4e 100644
--- a/external/ffspart/test/files/03-tiny-pnor.in
+++ b/external/ffspart/test/files/03-tiny-pnor.in
@@ -1,4 +1,4 @@
-ONE,0x00400,0x00000100,EV,/dev/zero
+ONE,0x00400,0x00000100,EL,/dev/zero
 TWO,0x00500,0x00000100,EF,/dev/zero
 THREE,0x600,0x00000100,EF,/dev/zero
 FOUR,0x0700,0x00000100,EF,/dev/zero
diff --git a/external/ffspart/test/files/03.1-tiny-pnor-backup.in b/external/ffspart/test/files/03.1-tiny-pnor-backup.in
index b552750..6209fbc 100644
--- a/external/ffspart/test/files/03.1-tiny-pnor-backup.in
+++ b/external/ffspart/test/files/03.1-tiny-pnor-backup.in
@@ -1,4 +1,4 @@
-ONE,0x00400,0x100,EV,/dev/zero
+ONE,0x00400,0x100,EL,/dev/zero
 TWO,0x00500,0x100,EF,/dev/zero
 THREE,0x600,0x100,EF,/dev/zero
 FOUR,0x0700,0x100,EF,/dev/zero
diff --git a/external/ffspart/test/files/04-tiny-pnor2.in b/external/ffspart/test/files/04-tiny-pnor2.in
index 34bfbde..5d1712c 100644
--- a/external/ffspart/test/files/04-tiny-pnor2.in
+++ b/external/ffspart/test/files/04-tiny-pnor2.in
@@ -1,4 +1,4 @@
-ONE,0x00000300,0x00000100,EV,SEDCATCH_1
+ONE,0x00000300,0x00000100,EL,SEDCATCH_1
 TWO,0x00000400,0x00000100,EF,SEDCATCH_2
 THREE,0x00000500,0x00000100,EF,SEDCATCH_3
 FOUR,0x00000600,0x00000100,EF,SEDCATCH_4
diff --git a/external/pflash/test/files/06-miscprint.ffs b/external/pflash/test/files/06-miscprint.ffs
index 885a6f2..58e84d5 100644
--- a/external/pflash/test/files/06-miscprint.ffs
+++ b/external/pflash/test/files/06-miscprint.ffs
@@ -2,5 +2,5 @@ PRESERVED,0x003000,0x1000,P,/dev/zero
 READONLY,0x0004000,0x1000,R,/dev/zero
 REPROVISION,0x5000,0x1000,F,/dev/zero
 BACKUP,0x000006000,0x1000,B,/dev/zero
-VOLATILE,0x000007000,0x1000,L,/dev/zero
+VOLATILE,0x000007000,0x1000,V,/dev/zero
 CLEARECC,0x000008000,0x1000,C,/dev/zero
diff --git a/external/pflash/test/results/01-info.out b/external/pflash/test/results/01-info.out
index 204d594..7377c71 100644
--- a/external/pflash/test/results/01-info.out
+++ b/external/pflash/test/results/01-info.out
@@ -7,9 +7,9 @@ Erase granule =  0KB           F:REPROVISION, V:VOLATILE, C:CLEARECC
 TOC@0x00000000 Partitions:
 -----------
 ID=00            part 0x00000000..0x00001000 (actual=0x00001000) [-------]
-ID=01             ONE 0x00003000..0x00004000 (actual=0x00001000) [E------]
+ID=01             ONE 0x00003000..0x00004000 (actual=0x00001000) [E----V-]
 ID=02             TWO 0x00004000..0x00005000 (actual=0x00001000) [E---F--]
 ID=03           THREE 0x00005000..0x00006000 (actual=0x00001000) [E---F--]
 ID=04            FOUR 0x00006000..0x00007000 (actual=0x00001000) [E---F--]
-ID=05            FIVE 0x00007000..0x00008000 (actual=0x00001000) [-----V-]
+ID=05            FIVE 0x00007000..0x00008000 (actual=0x00001000) [-------]
 ID=06             SIX 0x00008000..0x00009000 (actual=0x00001000) [------C]