[coreboot-gerrit] New patch to review for coreboot: chromeos.fmd: Mark RW_LEGACY as CBFS

Patrick Georgi (pgeorgi@google.com) gerrit at coreboot.org
Mon Apr 4 11:49:37 CEST 2016


Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14240

-gerrit

commit 7acb969678ce66a17a3ea06c3b16f675a87ea064
Author: Patrick Georgi <pgeorgi at google.com>
Date:   Thu Mar 31 15:59:41 2016 +0200

    chromeos.fmd: Mark RW_LEGACY as CBFS
    
    Change the existing chromeos.fmd files and the dts-to-fmd script to mark
    RW_LEGACY as CBFS, so it's properly "formatted".
    
    BUG=chromium:595715
    BRANCH=none
    TEST=none
    
    Change-Id: I76de26032ea8da0c7755a76a01e7bea9cfaebe23
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 717a00c459906fa87f61314ea4541c31b50539f4
    Original-Change-Id: I4b037b60d10be3da824c6baecabfd244eec2cdac
    Original-Signed-off-by: Patrick Georgi <pgeorgi at google.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/336403
    Original-Commit-Ready: Patrick Georgi <pgeorgi at chromium.org>
    Original-Tested-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Reviewed-by: Patrick Georgi <pgeorgi at chromium.org>
---
 src/mainboard/google/auron/chromeos.fmd         | 2 +-
 src/mainboard/google/auron_paine/chromeos.fmd   | 2 +-
 src/mainboard/google/bolt/chromeos.fmd          | 2 +-
 src/mainboard/google/butterfly/chromeos.fmd     | 2 +-
 src/mainboard/google/chell/chromeos.fmd         | 2 +-
 src/mainboard/google/cyan/chromeos.fmd          | 2 +-
 src/mainboard/google/falco/chromeos.fmd         | 2 +-
 src/mainboard/google/glados/chromeos.fmd        | 2 +-
 src/mainboard/google/guado/chromeos.fmd         | 2 +-
 src/mainboard/google/jecht/chromeos.fmd         | 2 +-
 src/mainboard/google/lars/chromeos.fmd          | 2 +-
 src/mainboard/google/link/chromeos.fmd          | 2 +-
 src/mainboard/google/nyan/chromeos.fmd          | 2 +-
 src/mainboard/google/nyan_big/chromeos.fmd      | 2 +-
 src/mainboard/google/nyan_blaze/chromeos.fmd    | 2 +-
 src/mainboard/google/oak/chromeos.fmd           | 2 +-
 src/mainboard/google/panther/chromeos.fmd       | 2 +-
 src/mainboard/google/parrot/chromeos.fmd        | 2 +-
 src/mainboard/google/peppy/chromeos.fmd         | 2 +-
 src/mainboard/google/rambi/chromeos.fmd         | 2 +-
 src/mainboard/google/samus/chromeos.fmd         | 2 +-
 src/mainboard/google/slippy/chromeos.fmd        | 2 +-
 src/mainboard/google/storm/chromeos.fmd         | 2 +-
 src/mainboard/google/stout/chromeos.fmd         | 2 +-
 src/mainboard/google/tidus/chromeos.fmd         | 2 +-
 src/mainboard/google/veyron/chromeos.fmd        | 2 +-
 src/mainboard/google/veyron_brain/chromeos.fmd  | 2 +-
 src/mainboard/google/veyron_danger/chromeos.fmd | 2 +-
 src/mainboard/google/veyron_emile/chromeos.fmd  | 2 +-
 src/mainboard/google/veyron_mickey/chromeos.fmd | 2 +-
 src/mainboard/google/veyron_rialto/chromeos.fmd | 2 +-
 src/mainboard/google/veyron_romy/chromeos.fmd   | 2 +-
 src/mainboard/intel/kunimitsu/chromeos.fmd      | 2 +-
 src/mainboard/intel/strago/chromeos.fmd         | 2 +-
 util/scripts/dts-to-fmd.sh                      | 5 +++++
 35 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/src/mainboard/google/auron/chromeos.fmd b/src/mainboard/google/auron/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/auron/chromeos.fmd
+++ b/src/mainboard/google/auron/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/auron_paine/chromeos.fmd b/src/mainboard/google/auron_paine/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/auron_paine/chromeos.fmd
+++ b/src/mainboard/google/auron_paine/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/bolt/chromeos.fmd b/src/mainboard/google/bolt/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/bolt/chromeos.fmd
+++ b/src/mainboard/google/bolt/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/butterfly/chromeos.fmd b/src/mainboard/google/butterfly/chromeos.fmd
index c05fd2a..0071533 100644
--- a/src/mainboard/google/butterfly/chromeos.fmd
+++ b/src/mainboard/google/butterfly/chromeos.fmd
@@ -23,7 +23,7 @@ FLASH at 0xff800000 0x800000 {
 		RW_ENVIRONMENT at 0x1f8000 0x4000
 		RW_VPD at 0x1fc000 0x2000
 		RW_UNUSED at 0x1fe000 0x2000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/chell/chromeos.fmd b/src/mainboard/google/chell/chromeos.fmd
index 5a8504e..58b6127 100644
--- a/src/mainboard/google/chell/chromeos.fmd
+++ b/src/mainboard/google/chell/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff000000 0x1000000 {
 		}
 		RW_VPD at 0x7f8000 0x2000
 		RW_NVRAM at 0x7fa000 0x6000
-		RW_LEGACY at 0x800000 0x200000
+		RW_LEGACY(CBFS)@0x800000 0x200000
 		WP_RO at 0xa00000 0x400000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/cyan/chromeos.fmd b/src/mainboard/google/cyan/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/cyan/chromeos.fmd
+++ b/src/mainboard/google/cyan/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/falco/chromeos.fmd b/src/mainboard/google/falco/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/falco/chromeos.fmd
+++ b/src/mainboard/google/falco/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/glados/chromeos.fmd b/src/mainboard/google/glados/chromeos.fmd
index 5a8504e..58b6127 100644
--- a/src/mainboard/google/glados/chromeos.fmd
+++ b/src/mainboard/google/glados/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff000000 0x1000000 {
 		}
 		RW_VPD at 0x7f8000 0x2000
 		RW_NVRAM at 0x7fa000 0x6000
-		RW_LEGACY at 0x800000 0x200000
+		RW_LEGACY(CBFS)@0x800000 0x200000
 		WP_RO at 0xa00000 0x400000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/guado/chromeos.fmd b/src/mainboard/google/guado/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/guado/chromeos.fmd
+++ b/src/mainboard/google/guado/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/jecht/chromeos.fmd b/src/mainboard/google/jecht/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/jecht/chromeos.fmd
+++ b/src/mainboard/google/jecht/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/lars/chromeos.fmd b/src/mainboard/google/lars/chromeos.fmd
index 5a8504e..58b6127 100644
--- a/src/mainboard/google/lars/chromeos.fmd
+++ b/src/mainboard/google/lars/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff000000 0x1000000 {
 		}
 		RW_VPD at 0x7f8000 0x2000
 		RW_NVRAM at 0x7fa000 0x6000
-		RW_LEGACY at 0x800000 0x200000
+		RW_LEGACY(CBFS)@0x800000 0x200000
 		WP_RO at 0xa00000 0x400000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/link/chromeos.fmd b/src/mainboard/google/link/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/link/chromeos.fmd
+++ b/src/mainboard/google/link/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/nyan/chromeos.fmd b/src/mainboard/google/nyan/chromeos.fmd
index 93afe34..617ebbc 100644
--- a/src/mainboard/google/nyan/chromeos.fmd
+++ b/src/mainboard/google/nyan/chromeos.fmd
@@ -24,5 +24,5 @@ FLASH at 0x0 0x400000 {
 		RW_FWID_B at 0x77f00 0x100
 	}
 	RW_VPD at 0x2f8000 0x8000
-	RW_LEGACY at 0x300000 0x100000
+	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/nyan_big/chromeos.fmd b/src/mainboard/google/nyan_big/chromeos.fmd
index 93afe34..617ebbc 100644
--- a/src/mainboard/google/nyan_big/chromeos.fmd
+++ b/src/mainboard/google/nyan_big/chromeos.fmd
@@ -24,5 +24,5 @@ FLASH at 0x0 0x400000 {
 		RW_FWID_B at 0x77f00 0x100
 	}
 	RW_VPD at 0x2f8000 0x8000
-	RW_LEGACY at 0x300000 0x100000
+	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/nyan_blaze/chromeos.fmd b/src/mainboard/google/nyan_blaze/chromeos.fmd
index 93afe34..617ebbc 100644
--- a/src/mainboard/google/nyan_blaze/chromeos.fmd
+++ b/src/mainboard/google/nyan_blaze/chromeos.fmd
@@ -24,5 +24,5 @@ FLASH at 0x0 0x400000 {
 		RW_FWID_B at 0x77f00 0x100
 	}
 	RW_VPD at 0x2f8000 0x8000
-	RW_LEGACY at 0x300000 0x100000
+	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/oak/chromeos.fmd b/src/mainboard/google/oak/chromeos.fmd
index a18bb6b..9c618e3 100644
--- a/src/mainboard/google/oak/chromeos.fmd
+++ b/src/mainboard/google/oak/chromeos.fmd
@@ -25,5 +25,5 @@ FLASH at 0x0 0x400000 {
 		RW_FWID_B at 0x77f00 0x100
 	}
 	RW_VPD at 0x2f8000 0x8000
-	RW_LEGACY at 0x300000 0x100000
+	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/panther/chromeos.fmd b/src/mainboard/google/panther/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/panther/chromeos.fmd
+++ b/src/mainboard/google/panther/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/parrot/chromeos.fmd b/src/mainboard/google/parrot/chromeos.fmd
index c05fd2a..0071533 100644
--- a/src/mainboard/google/parrot/chromeos.fmd
+++ b/src/mainboard/google/parrot/chromeos.fmd
@@ -23,7 +23,7 @@ FLASH at 0xff800000 0x800000 {
 		RW_ENVIRONMENT at 0x1f8000 0x4000
 		RW_VPD at 0x1fc000 0x2000
 		RW_UNUSED at 0x1fe000 0x2000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/peppy/chromeos.fmd b/src/mainboard/google/peppy/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/peppy/chromeos.fmd
+++ b/src/mainboard/google/peppy/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/rambi/chromeos.fmd b/src/mainboard/google/rambi/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/rambi/chromeos.fmd
+++ b/src/mainboard/google/rambi/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/samus/chromeos.fmd b/src/mainboard/google/samus/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/samus/chromeos.fmd
+++ b/src/mainboard/google/samus/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/slippy/chromeos.fmd b/src/mainboard/google/slippy/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/slippy/chromeos.fmd
+++ b/src/mainboard/google/slippy/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/storm/chromeos.fmd b/src/mainboard/google/storm/chromeos.fmd
index a7b4059..a9bdd7b 100644
--- a/src/mainboard/google/storm/chromeos.fmd
+++ b/src/mainboard/google/storm/chromeos.fmd
@@ -29,5 +29,5 @@ FLASH at 0x0 0x800000 {
 	RW_VPD at 0x6e0000 0x8000
 	RW_ELOG at 0x6e8000 0x8000
 	RW_NVRAM at 0x6f0000 0x10000
-	RW_LEGACY at 0x700000 0x100000
+	RW_LEGACY(CBFS)@0x700000 0x100000
 }
diff --git a/src/mainboard/google/stout/chromeos.fmd b/src/mainboard/google/stout/chromeos.fmd
index c05fd2a..0071533 100644
--- a/src/mainboard/google/stout/chromeos.fmd
+++ b/src/mainboard/google/stout/chromeos.fmd
@@ -23,7 +23,7 @@ FLASH at 0xff800000 0x800000 {
 		RW_ENVIRONMENT at 0x1f8000 0x4000
 		RW_VPD at 0x1fc000 0x2000
 		RW_UNUSED at 0x1fe000 0x2000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/tidus/chromeos.fmd b/src/mainboard/google/tidus/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/google/tidus/chromeos.fmd
+++ b/src/mainboard/google/tidus/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/google/veyron/chromeos.fmd b/src/mainboard/google/veyron/chromeos.fmd
index 93afe34..617ebbc 100644
--- a/src/mainboard/google/veyron/chromeos.fmd
+++ b/src/mainboard/google/veyron/chromeos.fmd
@@ -24,5 +24,5 @@ FLASH at 0x0 0x400000 {
 		RW_FWID_B at 0x77f00 0x100
 	}
 	RW_VPD at 0x2f8000 0x8000
-	RW_LEGACY at 0x300000 0x100000
+	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/veyron_brain/chromeos.fmd b/src/mainboard/google/veyron_brain/chromeos.fmd
index a18bb6b..9c618e3 100644
--- a/src/mainboard/google/veyron_brain/chromeos.fmd
+++ b/src/mainboard/google/veyron_brain/chromeos.fmd
@@ -25,5 +25,5 @@ FLASH at 0x0 0x400000 {
 		RW_FWID_B at 0x77f00 0x100
 	}
 	RW_VPD at 0x2f8000 0x8000
-	RW_LEGACY at 0x300000 0x100000
+	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/veyron_danger/chromeos.fmd b/src/mainboard/google/veyron_danger/chromeos.fmd
index a18bb6b..9c618e3 100644
--- a/src/mainboard/google/veyron_danger/chromeos.fmd
+++ b/src/mainboard/google/veyron_danger/chromeos.fmd
@@ -25,5 +25,5 @@ FLASH at 0x0 0x400000 {
 		RW_FWID_B at 0x77f00 0x100
 	}
 	RW_VPD at 0x2f8000 0x8000
-	RW_LEGACY at 0x300000 0x100000
+	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/veyron_emile/chromeos.fmd b/src/mainboard/google/veyron_emile/chromeos.fmd
index a18bb6b..9c618e3 100644
--- a/src/mainboard/google/veyron_emile/chromeos.fmd
+++ b/src/mainboard/google/veyron_emile/chromeos.fmd
@@ -25,5 +25,5 @@ FLASH at 0x0 0x400000 {
 		RW_FWID_B at 0x77f00 0x100
 	}
 	RW_VPD at 0x2f8000 0x8000
-	RW_LEGACY at 0x300000 0x100000
+	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/veyron_mickey/chromeos.fmd b/src/mainboard/google/veyron_mickey/chromeos.fmd
index a18bb6b..9c618e3 100644
--- a/src/mainboard/google/veyron_mickey/chromeos.fmd
+++ b/src/mainboard/google/veyron_mickey/chromeos.fmd
@@ -25,5 +25,5 @@ FLASH at 0x0 0x400000 {
 		RW_FWID_B at 0x77f00 0x100
 	}
 	RW_VPD at 0x2f8000 0x8000
-	RW_LEGACY at 0x300000 0x100000
+	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/veyron_rialto/chromeos.fmd b/src/mainboard/google/veyron_rialto/chromeos.fmd
index a18bb6b..9c618e3 100644
--- a/src/mainboard/google/veyron_rialto/chromeos.fmd
+++ b/src/mainboard/google/veyron_rialto/chromeos.fmd
@@ -25,5 +25,5 @@ FLASH at 0x0 0x400000 {
 		RW_FWID_B at 0x77f00 0x100
 	}
 	RW_VPD at 0x2f8000 0x8000
-	RW_LEGACY at 0x300000 0x100000
+	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/google/veyron_romy/chromeos.fmd b/src/mainboard/google/veyron_romy/chromeos.fmd
index a18bb6b..9c618e3 100644
--- a/src/mainboard/google/veyron_romy/chromeos.fmd
+++ b/src/mainboard/google/veyron_romy/chromeos.fmd
@@ -25,5 +25,5 @@ FLASH at 0x0 0x400000 {
 		RW_FWID_B at 0x77f00 0x100
 	}
 	RW_VPD at 0x2f8000 0x8000
-	RW_LEGACY at 0x300000 0x100000
+	RW_LEGACY(CBFS)@0x300000 0x100000
 }
diff --git a/src/mainboard/intel/kunimitsu/chromeos.fmd b/src/mainboard/intel/kunimitsu/chromeos.fmd
index 5a8504e..58b6127 100644
--- a/src/mainboard/intel/kunimitsu/chromeos.fmd
+++ b/src/mainboard/intel/kunimitsu/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff000000 0x1000000 {
 		}
 		RW_VPD at 0x7f8000 0x2000
 		RW_NVRAM at 0x7fa000 0x6000
-		RW_LEGACY at 0x800000 0x200000
+		RW_LEGACY(CBFS)@0x800000 0x200000
 		WP_RO at 0xa00000 0x400000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/src/mainboard/intel/strago/chromeos.fmd b/src/mainboard/intel/strago/chromeos.fmd
index 21b39c0..113fba6 100644
--- a/src/mainboard/intel/strago/chromeos.fmd
+++ b/src/mainboard/intel/strago/chromeos.fmd
@@ -22,7 +22,7 @@ FLASH at 0xff800000 0x800000 {
 		}
 		RW_VPD at 0x1f8000 0x2000
 		RW_UNUSED at 0x1fa000 0x6000
-		RW_LEGACY at 0x200000 0x200000
+		RW_LEGACY(CBFS)@0x200000 0x200000
 		WP_RO at 0x400000 0x200000 {
 			RO_VPD at 0x0 0x4000
 			RO_UNUSED at 0x4000 0xc000
diff --git a/util/scripts/dts-to-fmd.sh b/util/scripts/dts-to-fmd.sh
index 3b87eee..f1262fc 100755
--- a/util/scripts/dts-to-fmd.sh
+++ b/util/scripts/dts-to-fmd.sh
@@ -86,6 +86,11 @@ for region in $FMAP_REGIONS; do
 		IS_CBFS="(CBFS)"
 	fi
 
+	# also mark RW_LEGACY (seabios et al) as CBFS
+	if [ "${REGION_NAME}" = "RW_LEGACY" ]; then
+		IS_CBFS="(CBFS)"
+	fi
+
 	# special handling: COREBOOT region at 0, inject a 128K bootblock
 	# The size may need changes to accomodate the chipsets,
 	# but should work for now.



More information about the coreboot-gerrit mailing list