summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-03-30 08:01:43 +0000
committerStefan Reinauer <stepan@openbios.org>2010-03-30 08:01:43 +0000
commit9050b71802b801b24544013e6a515350b615ee68 (patch)
treeaf2dd624b1a997d3681f26a0704ea9810ffb3ea6 /src
parent7ac3df8ae29b787e94b22a2c3f4b21b15c22298c (diff)
downloadcoreboot-9050b71802b801b24544013e6a515350b615ee68.tar.xz
unify cmos.layout wrt AMD extended configuration registers.
This removes double preprocessor define warnings from many boards. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5323 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/amd/dbm690t/cmos.layout2
-rw-r--r--src/mainboard/amd/mahogany/cmos.layout2
-rw-r--r--src/mainboard/amd/mahogany_fam10/cmos.layout2
-rw-r--r--src/mainboard/amd/pistachio/cmos.layout2
-rw-r--r--src/mainboard/amd/serengeti_cheetah/cmos.layout2
-rw-r--r--src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout2
-rw-r--r--src/mainboard/arima/hdama/cmos.layout2
-rw-r--r--src/mainboard/asus/a8v-e_se/cmos.layout2
-rw-r--r--src/mainboard/asus/m2v-mx_se/cmos.layout2
-rw-r--r--src/mainboard/broadcom/blast/cmos.layout2
-rw-r--r--src/mainboard/dell/s1850/cmos.layout2
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/cmos.layout2
-rw-r--r--src/mainboard/gigabyte/m57sli/cmos.layout2
-rw-r--r--src/mainboard/hp/dl145_g3/cmos.layout2
-rw-r--r--src/mainboard/ibm/e325/cmos.layout2
-rw-r--r--src/mainboard/ibm/e326/cmos.layout2
-rw-r--r--src/mainboard/intel/jarrell/cmos.layout2
-rw-r--r--src/mainboard/iwill/dk8_htx/cmos.layout2
-rw-r--r--src/mainboard/iwill/dk8s2/cmos.layout2
-rw-r--r--src/mainboard/iwill/dk8x/cmos.layout2
-rw-r--r--src/mainboard/kontron/kt690/cmos.layout2
-rw-r--r--src/mainboard/msi/ms7135/cmos.layout2
-rw-r--r--src/mainboard/msi/ms7260/cmos.layout2
-rw-r--r--src/mainboard/msi/ms9185/cmos.layout2
-rw-r--r--src/mainboard/msi/ms9282/cmos.layout2
-rw-r--r--src/mainboard/msi/ms9652_fam10/cmos.layout2
-rw-r--r--src/mainboard/newisys/khepri/cmos.layout2
-rw-r--r--src/mainboard/nvidia/l1_2pvv/cmos.layout2
-rw-r--r--src/mainboard/sunw/ultra40/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8dme/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8dmr/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8dmr_fam10/cmos.layout2
-rw-r--r--src/mainboard/supermicro/h8qme_fam10/cmos.layout2
-rw-r--r--src/mainboard/supermicro/x6dai_g/cmos.layout2
-rw-r--r--src/mainboard/supermicro/x6dhe_g/cmos.layout2
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/cmos.layout2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/cmos.layout2
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/cmos.layout2
-rw-r--r--src/mainboard/technexion/tim5690/cmos.layout2
-rw-r--r--src/mainboard/technexion/tim8690/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2735/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2850/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2875/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2880/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2881/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2882/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2885/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2891/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2892/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2895/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2912/cmos.layout2
-rw-r--r--src/mainboard/tyan/s2912_fam10/cmos.layout2
-rw-r--r--src/mainboard/tyan/s4880/cmos.layout2
-rw-r--r--src/mainboard/tyan/s4882/cmos.layout2
54 files changed, 54 insertions, 54 deletions
diff --git a/src/mainboard/amd/dbm690t/cmos.layout b/src/mainboard/amd/dbm690t/cmos.layout
index d9533989fb..54b30d09aa 100644
--- a/src/mainboard/amd/dbm690t/cmos.layout
+++ b/src/mainboard/amd/dbm690t/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/amd/mahogany/cmos.layout b/src/mainboard/amd/mahogany/cmos.layout
index fa10382621..7d34e3f296 100644
--- a/src/mainboard/amd/mahogany/cmos.layout
+++ b/src/mainboard/amd/mahogany/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/amd/mahogany_fam10/cmos.layout b/src/mainboard/amd/mahogany_fam10/cmos.layout
index 7698c9597d..97b7043e91 100644
--- a/src/mainboard/amd/mahogany_fam10/cmos.layout
+++ b/src/mainboard/amd/mahogany_fam10/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/amd/pistachio/cmos.layout b/src/mainboard/amd/pistachio/cmos.layout
index 84dc151988..54b30d09aa 100644
--- a/src/mainboard/amd/pistachio/cmos.layout
+++ b/src/mainboard/amd/pistachio/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/amd/serengeti_cheetah/cmos.layout b/src/mainboard/amd/serengeti_cheetah/cmos.layout
index 8c47da5867..77ad6b5593 100644
--- a/src/mainboard/amd/serengeti_cheetah/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
index 7698c9597d..97b7043e91 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/arima/hdama/cmos.layout b/src/mainboard/arima/hdama/cmos.layout
index c08e79a42b..7e20f4ce9c 100644
--- a/src/mainboard/arima/hdama/cmos.layout
+++ b/src/mainboard/arima/hdama/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/asus/a8v-e_se/cmos.layout b/src/mainboard/asus/a8v-e_se/cmos.layout
index 758c8dc4ee..408224914e 100644
--- a/src/mainboard/asus/a8v-e_se/cmos.layout
+++ b/src/mainboard/asus/a8v-e_se/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/asus/m2v-mx_se/cmos.layout b/src/mainboard/asus/m2v-mx_se/cmos.layout
index 827637608d..66e1c44d1d 100644
--- a/src/mainboard/asus/m2v-mx_se/cmos.layout
+++ b/src/mainboard/asus/m2v-mx_se/cmos.layout
@@ -47,7 +47,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/broadcom/blast/cmos.layout b/src/mainboard/broadcom/blast/cmos.layout
index fa37d683d0..a7748b7f9d 100644
--- a/src/mainboard/broadcom/blast/cmos.layout
+++ b/src/mainboard/broadcom/blast/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/dell/s1850/cmos.layout b/src/mainboard/dell/s1850/cmos.layout
index 62356d440d..df4f4dfcfc 100644
--- a/src/mainboard/dell/s1850/cmos.layout
+++ b/src/mainboard/dell/s1850/cmos.layout
@@ -40,7 +40,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 amd_reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
index af5c7cd800..61ec7fcd9b 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
+++ b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/gigabyte/m57sli/cmos.layout b/src/mainboard/gigabyte/m57sli/cmos.layout
index e6fff6f509..10a8e9fce9 100644
--- a/src/mainboard/gigabyte/m57sli/cmos.layout
+++ b/src/mainboard/gigabyte/m57sli/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/hp/dl145_g3/cmos.layout b/src/mainboard/hp/dl145_g3/cmos.layout
index 3f6d68f41c..4d49af7f5f 100644
--- a/src/mainboard/hp/dl145_g3/cmos.layout
+++ b/src/mainboard/hp/dl145_g3/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/ibm/e325/cmos.layout b/src/mainboard/ibm/e325/cmos.layout
index fa37d683d0..a7748b7f9d 100644
--- a/src/mainboard/ibm/e325/cmos.layout
+++ b/src/mainboard/ibm/e325/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/ibm/e326/cmos.layout b/src/mainboard/ibm/e326/cmos.layout
index fa37d683d0..a7748b7f9d 100644
--- a/src/mainboard/ibm/e326/cmos.layout
+++ b/src/mainboard/ibm/e326/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/intel/jarrell/cmos.layout b/src/mainboard/intel/jarrell/cmos.layout
index eb970d18bd..ba7f604a4d 100644
--- a/src/mainboard/intel/jarrell/cmos.layout
+++ b/src/mainboard/intel/jarrell/cmos.layout
@@ -42,7 +42,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 amd_reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/iwill/dk8_htx/cmos.layout b/src/mainboard/iwill/dk8_htx/cmos.layout
index 8c47da5867..77ad6b5593 100644
--- a/src/mainboard/iwill/dk8_htx/cmos.layout
+++ b/src/mainboard/iwill/dk8_htx/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/iwill/dk8s2/cmos.layout b/src/mainboard/iwill/dk8s2/cmos.layout
index fa37d683d0..a7748b7f9d 100644
--- a/src/mainboard/iwill/dk8s2/cmos.layout
+++ b/src/mainboard/iwill/dk8s2/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/iwill/dk8x/cmos.layout b/src/mainboard/iwill/dk8x/cmos.layout
index fa37d683d0..a7748b7f9d 100644
--- a/src/mainboard/iwill/dk8x/cmos.layout
+++ b/src/mainboard/iwill/dk8x/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/kontron/kt690/cmos.layout b/src/mainboard/kontron/kt690/cmos.layout
index d9533989fb..54b30d09aa 100644
--- a/src/mainboard/kontron/kt690/cmos.layout
+++ b/src/mainboard/kontron/kt690/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/msi/ms7135/cmos.layout b/src/mainboard/msi/ms7135/cmos.layout
index 3f6d68f41c..4d49af7f5f 100644
--- a/src/mainboard/msi/ms7135/cmos.layout
+++ b/src/mainboard/msi/ms7135/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/msi/ms7260/cmos.layout b/src/mainboard/msi/ms7260/cmos.layout
index 49c353f4f6..ed82c0b8f1 100644
--- a/src/mainboard/msi/ms7260/cmos.layout
+++ b/src/mainboard/msi/ms7260/cmos.layout
@@ -68,7 +68,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/msi/ms9185/cmos.layout b/src/mainboard/msi/ms9185/cmos.layout
index 3f6d68f41c..4d49af7f5f 100644
--- a/src/mainboard/msi/ms9185/cmos.layout
+++ b/src/mainboard/msi/ms9185/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/msi/ms9282/cmos.layout b/src/mainboard/msi/ms9282/cmos.layout
index b079d53d94..408224914e 100644
--- a/src/mainboard/msi/ms9282/cmos.layout
+++ b/src/mainboard/msi/ms9282/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 amd_reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/msi/ms9652_fam10/cmos.layout b/src/mainboard/msi/ms9652_fam10/cmos.layout
index 07492b6695..419ac87c2d 100644
--- a/src/mainboard/msi/ms9652_fam10/cmos.layout
+++ b/src/mainboard/msi/ms9652_fam10/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/newisys/khepri/cmos.layout b/src/mainboard/newisys/khepri/cmos.layout
index fa37d683d0..a7748b7f9d 100644
--- a/src/mainboard/newisys/khepri/cmos.layout
+++ b/src/mainboard/newisys/khepri/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/nvidia/l1_2pvv/cmos.layout b/src/mainboard/nvidia/l1_2pvv/cmos.layout
index 9d92b831cb..958843ab22 100644
--- a/src/mainboard/nvidia/l1_2pvv/cmos.layout
+++ b/src/mainboard/nvidia/l1_2pvv/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/sunw/ultra40/cmos.layout b/src/mainboard/sunw/ultra40/cmos.layout
index 5eb88b9a5a..a7748b7f9d 100644
--- a/src/mainboard/sunw/ultra40/cmos.layout
+++ b/src/mainboard/sunw/ultra40/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/supermicro/h8dme/cmos.layout b/src/mainboard/supermicro/h8dme/cmos.layout
index e6fff6f509..10a8e9fce9 100644
--- a/src/mainboard/supermicro/h8dme/cmos.layout
+++ b/src/mainboard/supermicro/h8dme/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/supermicro/h8dmr/cmos.layout b/src/mainboard/supermicro/h8dmr/cmos.layout
index e6fff6f509..10a8e9fce9 100644
--- a/src/mainboard/supermicro/h8dmr/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
index 2ce5a60bc4..5ffec3abc9 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/supermicro/h8qme_fam10/cmos.layout b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
index 2ce5a60bc4..5ffec3abc9 100644
--- a/src/mainboard/supermicro/h8qme_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/supermicro/x6dai_g/cmos.layout b/src/mainboard/supermicro/x6dai_g/cmos.layout
index 62356d440d..df4f4dfcfc 100644
--- a/src/mainboard/supermicro/x6dai_g/cmos.layout
+++ b/src/mainboard/supermicro/x6dai_g/cmos.layout
@@ -40,7 +40,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 amd_reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/supermicro/x6dhe_g/cmos.layout b/src/mainboard/supermicro/x6dhe_g/cmos.layout
index 62356d440d..df4f4dfcfc 100644
--- a/src/mainboard/supermicro/x6dhe_g/cmos.layout
+++ b/src/mainboard/supermicro/x6dhe_g/cmos.layout
@@ -40,7 +40,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 amd_reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/supermicro/x6dhe_g2/cmos.layout b/src/mainboard/supermicro/x6dhe_g2/cmos.layout
index 62356d440d..df4f4dfcfc 100644
--- a/src/mainboard/supermicro/x6dhe_g2/cmos.layout
+++ b/src/mainboard/supermicro/x6dhe_g2/cmos.layout
@@ -40,7 +40,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 amd_reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/supermicro/x6dhr_ig/cmos.layout b/src/mainboard/supermicro/x6dhr_ig/cmos.layout
index 62356d440d..df4f4dfcfc 100644
--- a/src/mainboard/supermicro/x6dhr_ig/cmos.layout
+++ b/src/mainboard/supermicro/x6dhr_ig/cmos.layout
@@ -40,7 +40,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 amd_reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/supermicro/x6dhr_ig2/cmos.layout b/src/mainboard/supermicro/x6dhr_ig2/cmos.layout
index 62356d440d..df4f4dfcfc 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/cmos.layout
+++ b/src/mainboard/supermicro/x6dhr_ig2/cmos.layout
@@ -40,7 +40,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 amd_reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/technexion/tim5690/cmos.layout b/src/mainboard/technexion/tim5690/cmos.layout
index d9533989fb..54b30d09aa 100644
--- a/src/mainboard/technexion/tim5690/cmos.layout
+++ b/src/mainboard/technexion/tim5690/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/technexion/tim8690/cmos.layout b/src/mainboard/technexion/tim8690/cmos.layout
index d9533989fb..54b30d09aa 100644
--- a/src/mainboard/technexion/tim8690/cmos.layout
+++ b/src/mainboard/technexion/tim8690/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s2735/cmos.layout b/src/mainboard/tyan/s2735/cmos.layout
index 74c118b755..9afd72c978 100644
--- a/src/mainboard/tyan/s2735/cmos.layout
+++ b/src/mainboard/tyan/s2735/cmos.layout
@@ -44,7 +44,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s2850/cmos.layout b/src/mainboard/tyan/s2850/cmos.layout
index 5eb88b9a5a..a7748b7f9d 100644
--- a/src/mainboard/tyan/s2850/cmos.layout
+++ b/src/mainboard/tyan/s2850/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s2875/cmos.layout b/src/mainboard/tyan/s2875/cmos.layout
index fa37d683d0..a7748b7f9d 100644
--- a/src/mainboard/tyan/s2875/cmos.layout
+++ b/src/mainboard/tyan/s2875/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s2880/cmos.layout b/src/mainboard/tyan/s2880/cmos.layout
index 5eb88b9a5a..a7748b7f9d 100644
--- a/src/mainboard/tyan/s2880/cmos.layout
+++ b/src/mainboard/tyan/s2880/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s2881/cmos.layout b/src/mainboard/tyan/s2881/cmos.layout
index 5eb88b9a5a..a7748b7f9d 100644
--- a/src/mainboard/tyan/s2881/cmos.layout
+++ b/src/mainboard/tyan/s2881/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s2882/cmos.layout b/src/mainboard/tyan/s2882/cmos.layout
index fa37d683d0..a7748b7f9d 100644
--- a/src/mainboard/tyan/s2882/cmos.layout
+++ b/src/mainboard/tyan/s2882/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s2885/cmos.layout b/src/mainboard/tyan/s2885/cmos.layout
index fa37d683d0..a7748b7f9d 100644
--- a/src/mainboard/tyan/s2885/cmos.layout
+++ b/src/mainboard/tyan/s2885/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s2891/cmos.layout b/src/mainboard/tyan/s2891/cmos.layout
index 5eb88b9a5a..a7748b7f9d 100644
--- a/src/mainboard/tyan/s2891/cmos.layout
+++ b/src/mainboard/tyan/s2891/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s2892/cmos.layout b/src/mainboard/tyan/s2892/cmos.layout
index fa37d683d0..a7748b7f9d 100644
--- a/src/mainboard/tyan/s2892/cmos.layout
+++ b/src/mainboard/tyan/s2892/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s2895/cmos.layout b/src/mainboard/tyan/s2895/cmos.layout
index fa37d683d0..a7748b7f9d 100644
--- a/src/mainboard/tyan/s2895/cmos.layout
+++ b/src/mainboard/tyan/s2895/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s2912/cmos.layout b/src/mainboard/tyan/s2912/cmos.layout
index 9d92b831cb..958843ab22 100644
--- a/src/mainboard/tyan/s2912/cmos.layout
+++ b/src/mainboard/tyan/s2912/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s2912_fam10/cmos.layout b/src/mainboard/tyan/s2912_fam10/cmos.layout
index 07492b6695..419ac87c2d 100644
--- a/src/mainboard/tyan/s2912_fam10/cmos.layout
+++ b/src/mainboard/tyan/s2912_fam10/cmos.layout
@@ -67,7 +67,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s4880/cmos.layout b/src/mainboard/tyan/s4880/cmos.layout
index 5eb88b9a5a..a7748b7f9d 100644
--- a/src/mainboard/tyan/s4880/cmos.layout
+++ b/src/mainboard/tyan/s4880/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory
+1000 24 r 0 amd_reserved
diff --git a/src/mainboard/tyan/s4882/cmos.layout b/src/mainboard/tyan/s4882/cmos.layout
index fa37d683d0..a7748b7f9d 100644
--- a/src/mainboard/tyan/s4882/cmos.layout
+++ b/src/mainboard/tyan/s4882/cmos.layout
@@ -46,7 +46,7 @@ entries
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
-1000 24 r 0 reserved_memory1
+1000 24 r 0 amd_reserved