3 files changed, 36 insertions, 36 deletions

diff --git a/src/mainboard/siemens/mc_apl1/mc_apl1.fmd b/src/mainboard/siemens/mc_apl1/mc_apl1.fmd
index 8c6dda8496..36772d6686 100644
--- a/src/mainboard/siemens/mc_apl1/mc_apl1.fmd
+++ b/src/mainboard/siemens/mc_apl1/mc_apl1.fmd
@@ -1,14 +1,14 @@
 FLASH 16M {
 	SI_DESC@0x0 0x1000
-	IFWI@0x1000 0x2ff000
-	FMAP@0x300000 0x800
-	COREBOOT(CBFS)@0x300800 0xb9d800
-	UNIFIED_MRC_CACHE@0xe9e000 0x21000 {
-		RECOVERY_MRC_CACHE@0x0 0x10000
-		RW_MRC_CACHE@0x10000 0x10000
-		RW_VAR_MRC_CACHE@0x20000 0x1000
+	IFWI 0x2ff000
+	FMAP 0x800
+	COREBOOT(CBFS) 0xb9d800
+	UNIFIED_MRC_CACHE 0x21000 {
+		RECOVERY_MRC_CACHE 0x10000
+		RW_MRC_CACHE 0x10000
+		RW_VAR_MRC_CACHE 0x1000
 	}
-	BIOS_UNUSABLE@0xebf000 0x40000
-	DEVICE_EXTENSION@0xeff000 0x100000
-	UNUSED_HOLE@0xfff000 0x1000
+	BIOS_UNUSABLE 0x40000
+	DEVICE_EXTENSION 0x100000
+	UNUSED_HOLE 0x1000
 }
diff --git a/src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd b/src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd
index d1cbfcf7f7..8af2e9ab3f 100644
--- a/src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd
+++ b/src/mainboard/siemens/mc_apl1/mc_apl_vboot.fmd
@@ -1,30 +1,30 @@
 FLASH 16M {
 	WP_RO@0x0 0xe93000 {
-		SI_DESC@0x0 0x1000
-		IFWI@0x1000 0x2ff000
-		RO_VPD@0x300000 0x4000
-		RO_SECTION@0x304000 0xb8f000 {
-			FMAP@0x0 0x800
-			RO_FRID@0x800 0x40
-			RO_FRID_PAD@0x840 0x7c0
-			COREBOOT(CBFS)@0x1000 0xb4e000
-			GBB@0xb4f000 0x40000
+		SI_DESC 0x1000
+		IFWI 0x2ff000
+		RO_VPD 0x4000
+		RO_SECTION 0xb8f000 {
+			FMAP 0x800
+			RO_FRID 0x40
+			RO_FRID_PAD 0x7c0
+			COREBOOT(CBFS) 0xb4e000
+			GBB 0x40000
 		}
 	}
-	MISC_RW@0xe93000 0x2c000 {
-		UNIFIED_MRC_CACHE@0x0 0x21000 {
-			RECOVERY_MRC_CACHE@0x0 0x10000
-			RW_MRC_CACHE@0x10000 0x10000
-			RW_VAR_MRC_CACHE@0x20000 0x1000
+	MISC_RW 0x2c000 {
+		UNIFIED_MRC_CACHE 0x21000 {
+			RECOVERY_MRC_CACHE 0x10000
+			RW_MRC_CACHE 0x10000
+			RW_VAR_MRC_CACHE 0x1000
 		}
-		RW_SHARED@0x21000 0x4000 {
-			SHARED_DATA@0x0 0x2000
-			VBLOCK_DEV@0x2000 0x2000
+		RW_SHARED 0x4000 {
+			SHARED_DATA 0x2000
+			VBLOCK_DEV 0x2000
 		}
-		RW_VPD@0x25000 0x2000
-		RW_NVRAM@0x27000 0x5000
+		RW_VPD 0x2000
+		RW_NVRAM 0x5000
 	}
-	BIOS_UNUSABLE@0xebf000 0x40000
-	DEVICE_EXTENSION@0xeff000 0x100000
-	UNUSED_HOLE@0xfff000 0x1000
+	BIOS_UNUSABLE 0x40000
+	DEVICE_EXTENSION 0x100000
+	UNUSED_HOLE 0x1000
 }
diff --git a/src/mainboard/siemens/mc_bdx1/mc_bdx1.fmd b/src/mainboard/siemens/mc_bdx1/mc_bdx1.fmd
index cb7ef391e1..44502f607c 100644
--- a/src/mainboard/siemens/mc_bdx1/mc_bdx1.fmd
+++ b/src/mainboard/siemens/mc_bdx1/mc_bdx1.fmd
@@ -1,9 +1,9 @@
 FLASH@0xff000000 0x1000000 {
-	SI_ALL@0x0 0x300000 {
-		SI_DESC@0x0 0x1000
-		SI_ME@0x1000 0x2ff000
+	SI_ALL 0x300000 {
+		SI_DESC 0x1000
+		SI_ME 0x2ff000
 	}
-	SI_BIOS@0x300000 0xd00000 {
+	SI_BIOS 0xd00000 {
 		RW_MRC_CACHE 0x10000
 		RW_SHARED 0x4000 {
 			SHARED_DATA 0x2000