[coreboot-gerrit] New patch to review for coreboot: mb/*/*/cmos.layout: Make multibyte options byte alligned
Arthur Heymans (arthur@aheymans.xyz)
gerrit at coreboot.org
Fri Feb 10 12:38:02 CET 2017
Arthur Heymans (arthur at aheymans.xyz) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18321
-gerrit
commit 60c488bb688af257af75c982ecfaab6771cfac47
Author: Arthur Heymans <arthur at aheymans.xyz>
Date: Wed Feb 8 18:12:31 2017 +0100
mb/*/*/cmos.layout: Make multibyte options byte alligned
Changes the offsets of some options so that options that span multiply
bytes are byte alligned.
To make the cmos.layout file more consistant some things where moved
around in the cmos.layout of thinkpads X200 and T400.
Change-Id: Ic84a2a5dc6f9c102f041085871c2ed55e2f3692a
Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
---
src/mainboard/adi/rcc-dff/cmos.layout | 10 ++++-----
.../amd/serengeti_cheetah_fam10/cmos.layout | 3 ++-
src/mainboard/asus/kcma-d8/cmos.layout | 6 ++++--
src/mainboard/asus/kfsn4-dre/cmos.layout | 3 ++-
src/mainboard/asus/kgpe-d16/cmos.layout | 6 ++++--
src/mainboard/esd/atom15/cmos.layout | 10 ++++-----
src/mainboard/hp/dl165_g6_fam10/cmos.layout | 3 ++-
src/mainboard/intel/littleplains/cmos.layout | 10 ++++-----
src/mainboard/intel/minnowmax/cmos.layout | 10 ++++-----
src/mainboard/intel/mohonpeak/cmos.layout | 10 ++++-----
src/mainboard/kontron/ktqm77/cmos.layout | 11 +++++-----
src/mainboard/lenovo/t400/cmos.layout | 24 ++++++++++------------
src/mainboard/lenovo/x200/cmos.layout | 19 ++++++++---------
src/mainboard/msi/ms9652_fam10/cmos.layout | 3 ++-
src/mainboard/pcengines/apu1/cmos.layout | 3 ++-
src/mainboard/supermicro/h8dmr_fam10/cmos.layout | 3 ++-
src/mainboard/supermicro/h8qme_fam10/cmos.layout | 3 ++-
src/mainboard/tyan/s2912_fam10/cmos.layout | 3 ++-
18 files changed, 74 insertions(+), 66 deletions(-)
diff --git a/src/mainboard/adi/rcc-dff/cmos.layout b/src/mainboard/adi/rcc-dff/cmos.layout
index 2704122..235b63c 100644
--- a/src/mainboard/adi/rcc-dff/cmos.layout
+++ b/src/mainboard/adi/rcc-dff/cmos.layout
@@ -69,11 +69,11 @@ entries
#1000 24 r 0 amd_reserved
#save timestamps in pre-ram boot areas
-1719 64 h 0 timestamp_value1
-1783 64 h 0 timestamp_value2
-1847 64 h 0 timestamp_value3
-1911 64 h 0 timestamp_value4
-1975 64 h 0 timestamp_value5
+1720 64 h 0 timestamp_value1
+1784 64 h 0 timestamp_value2
+1848 64 h 0 timestamp_value3
+1912 64 h 0 timestamp_value4
+1976 64 h 0 timestamp_value5
# -----------------------------------------------------------------
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
index fe0ff4e..7fad0be 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
@@ -22,13 +22,14 @@ entries
384 1 e 4 boot_option
388 4 h 0 reboot_counter
393 3 e 5 baud_rate
-396 5 e 10 ecc_scrub_rate
+#396 5 unused
401 1 e 1 interleave_chip_selects
402 1 e 1 interleave_nodes
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
+416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
diff --git a/src/mainboard/asus/kcma-d8/cmos.layout b/src/mainboard/asus/kcma-d8/cmos.layout
index b9dadf4..0bab4c9 100644
--- a/src/mainboard/asus/kcma-d8/cmos.layout
+++ b/src/mainboard/asus/kcma-d8/cmos.layout
@@ -22,13 +22,14 @@ entries
384 1 e 4 boot_option
388 4 h 0 reboot_counter
393 3 e 5 baud_rate
-396 5 e 10 ecc_scrub_rate
+#396 5 unused
401 1 e 1 interleave_chip_selects
402 1 e 1 interleave_nodes
403 1 e 1 interleave_memory_channels
404 4 e 8 max_mem_clock
408 1 e 2 multi_core
412 4 e 6 debug_level
+416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -42,7 +43,7 @@ entries
466 1 e 1 cpu_cc6_state
467 1 e 1 sata_ahci_mode
468 1 e 1 sata_alpm
-469 4 h 0 maximum_p_state_limit
+#469 4 unused
473 2 e 13 dimm_spd_checksum
475 1 e 14 probe_filter
476 1 e 1 l3_cache_partitioning
@@ -51,6 +52,7 @@ entries
480 1 e 2 ehci_async_data_cache
481 1 e 1 experimental_memory_speed_boost
482 1 r 0 allow_spd_nvram_cache_restore
+483 4 h 0 maximum_p_state_limit
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
diff --git a/src/mainboard/asus/kfsn4-dre/cmos.layout b/src/mainboard/asus/kfsn4-dre/cmos.layout
index 169af87..d0f6211 100644
--- a/src/mainboard/asus/kfsn4-dre/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre/cmos.layout
@@ -22,13 +22,14 @@ entries
384 1 e 4 boot_option
388 4 h 0 reboot_counter
393 3 e 5 baud_rate
-396 5 e 10 ecc_scrub_rate
+#396 5 unused
401 1 e 1 interleave_chip_selects
402 1 e 1 interleave_nodes
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
+416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
diff --git a/src/mainboard/asus/kgpe-d16/cmos.layout b/src/mainboard/asus/kgpe-d16/cmos.layout
index 18c7a3f..e65f7c8 100644
--- a/src/mainboard/asus/kgpe-d16/cmos.layout
+++ b/src/mainboard/asus/kgpe-d16/cmos.layout
@@ -22,13 +22,14 @@ entries
384 1 e 4 boot_option
388 4 h 0 reboot_counter
393 3 e 5 baud_rate
-396 5 e 10 ecc_scrub_rate
+#396 5 unused
401 1 e 1 interleave_chip_selects
402 1 e 1 interleave_nodes
403 1 e 1 interleave_memory_channels
404 4 e 8 max_mem_clock
408 1 e 2 multi_core
412 4 e 6 debug_level
+416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
@@ -42,7 +43,7 @@ entries
466 1 e 1 cpu_cc6_state
467 1 e 1 sata_ahci_mode
468 1 e 1 sata_alpm
-469 4 h 0 maximum_p_state_limit
+#469 4 unused
473 2 e 13 dimm_spd_checksum
475 1 e 14 probe_filter
476 1 e 1 l3_cache_partitioning
@@ -52,6 +53,7 @@ entries
480 1 e 2 ehci_async_data_cache
481 1 e 1 experimental_memory_speed_boost
482 1 r 0 allow_spd_nvram_cache_restore
+483 4 h 0 maximum_p_state_limit
728 256 h 0 user_data
984 16 h 0 check_sum
# Reserve the extended AMD configuration registers
diff --git a/src/mainboard/esd/atom15/cmos.layout b/src/mainboard/esd/atom15/cmos.layout
index f65750c..fc92f96 100644
--- a/src/mainboard/esd/atom15/cmos.layout
+++ b/src/mainboard/esd/atom15/cmos.layout
@@ -70,11 +70,11 @@ entries
#1000 24 r 0 amd_reserved
#save timestamps in pre-ram boot areas
-1719 64 h 0 timestamp_value1
-1783 64 h 0 timestamp_value2
-1847 64 h 0 timestamp_value3
-1911 64 h 0 timestamp_value4
-1975 64 h 0 timestamp_value5
+1720 64 h 0 timestamp_value1
+1784 64 h 0 timestamp_value2
+1848 64 h 0 timestamp_value3
+1912 64 h 0 timestamp_value4
+1976 64 h 0 timestamp_value5
# -----------------------------------------------------------------
diff --git a/src/mainboard/hp/dl165_g6_fam10/cmos.layout b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
index 37ab3bd..21bbf28 100644
--- a/src/mainboard/hp/dl165_g6_fam10/cmos.layout
+++ b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
@@ -22,13 +22,14 @@ entries
384 1 e 4 boot_option
388 4 h 0 reboot_counter
393 3 e 5 baud_rate
-396 5 e 10 ecc_scrub_rate
+#396 5 unused
401 1 e 1 interleave_chip_selects
402 1 e 1 interleave_nodes
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
+416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
diff --git a/src/mainboard/intel/littleplains/cmos.layout b/src/mainboard/intel/littleplains/cmos.layout
index 2704122..235b63c 100644
--- a/src/mainboard/intel/littleplains/cmos.layout
+++ b/src/mainboard/intel/littleplains/cmos.layout
@@ -69,11 +69,11 @@ entries
#1000 24 r 0 amd_reserved
#save timestamps in pre-ram boot areas
-1719 64 h 0 timestamp_value1
-1783 64 h 0 timestamp_value2
-1847 64 h 0 timestamp_value3
-1911 64 h 0 timestamp_value4
-1975 64 h 0 timestamp_value5
+1720 64 h 0 timestamp_value1
+1784 64 h 0 timestamp_value2
+1848 64 h 0 timestamp_value3
+1912 64 h 0 timestamp_value4
+1976 64 h 0 timestamp_value5
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/minnowmax/cmos.layout b/src/mainboard/intel/minnowmax/cmos.layout
index f65750c..fc92f96 100644
--- a/src/mainboard/intel/minnowmax/cmos.layout
+++ b/src/mainboard/intel/minnowmax/cmos.layout
@@ -70,11 +70,11 @@ entries
#1000 24 r 0 amd_reserved
#save timestamps in pre-ram boot areas
-1719 64 h 0 timestamp_value1
-1783 64 h 0 timestamp_value2
-1847 64 h 0 timestamp_value3
-1911 64 h 0 timestamp_value4
-1975 64 h 0 timestamp_value5
+1720 64 h 0 timestamp_value1
+1784 64 h 0 timestamp_value2
+1848 64 h 0 timestamp_value3
+1912 64 h 0 timestamp_value4
+1976 64 h 0 timestamp_value5
# -----------------------------------------------------------------
diff --git a/src/mainboard/intel/mohonpeak/cmos.layout b/src/mainboard/intel/mohonpeak/cmos.layout
index 2704122..235b63c 100644
--- a/src/mainboard/intel/mohonpeak/cmos.layout
+++ b/src/mainboard/intel/mohonpeak/cmos.layout
@@ -69,11 +69,11 @@ entries
#1000 24 r 0 amd_reserved
#save timestamps in pre-ram boot areas
-1719 64 h 0 timestamp_value1
-1783 64 h 0 timestamp_value2
-1847 64 h 0 timestamp_value3
-1911 64 h 0 timestamp_value4
-1975 64 h 0 timestamp_value5
+1720 64 h 0 timestamp_value1
+1784 64 h 0 timestamp_value2
+1848 64 h 0 timestamp_value3
+1912 64 h 0 timestamp_value4
+1976 64 h 0 timestamp_value5
# -----------------------------------------------------------------
diff --git a/src/mainboard/kontron/ktqm77/cmos.layout b/src/mainboard/kontron/ktqm77/cmos.layout
index b17ee51..7cf1040 100644
--- a/src/mainboard/kontron/ktqm77/cmos.layout
+++ b/src/mainboard/kontron/ktqm77/cmos.layout
@@ -61,14 +61,13 @@ entries
408 1 e 1 nmi
409 2 e 7 power_on_after_fail
411 1 e 11 sata_mode
-#412 4 r 0 unused
# coreboot config options: additional mainboard options
-416 4 e 10 systemp_type
-420 7 h 0 fan1_min
-427 7 h 0 fan1_max
-434 7 h 0 fan2_min
-441 7 h 0 fan2_max
+412 4 e 10 systemp_type
+416 7 h 0 fan1_min
+424 7 h 0 fan1_max
+432 7 h 0 fan2_min
+440 7 h 0 fan2_max
# coreboot config options: bootloader
448 64 r 0 write_protected_by_bios
diff --git a/src/mainboard/lenovo/t400/cmos.layout b/src/mainboard/lenovo/t400/cmos.layout
index 61212dd..9cbd462 100644
--- a/src/mainboard/lenovo/t400/cmos.layout
+++ b/src/mainboard/lenovo/t400/cmos.layout
@@ -65,23 +65,21 @@ entries
413 1 e 1 wwan
414 1 e 1 wlan
415 1 e 1 trackpoint
-416 1 e 1 fn_ctrl_swap
-417 1 e 1 sticky_fn
+416 8 h 0 volume
+424 1 e 1 fn_ctrl_swap
+425 1 e 1 sticky_fn
+426 1 e 1 power_management_beeps
+927 1 e 1 low_battery_beep
+928 1 e 1 uwb
-# coreboot config options: bootloader
-418 512 s 0 boot_devices
-930 8 h 0 boot_default
-938 1 e 1 power_management_beeps
-939 1 e 1 low_battery_beep
-940 1 e 1 uwb
+# coreboot config options: bootloader
+429 512 s 0 boot_devices
+944 8 h 0 boot_default
# coreboot config options: northbridge
-944 2 e 12 hybrid_graphics_mode
-946 4 e 11 gfx_uma_size
-
-# coreboot config options: EC
-952 8 h 0 volume
+952 2 e 12 hybrid_graphics_mode
+954 4 e 11 gfx_uma_size
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/lenovo/x200/cmos.layout b/src/mainboard/lenovo/x200/cmos.layout
index 35d5017..69fda72 100644
--- a/src/mainboard/lenovo/x200/cmos.layout
+++ b/src/mainboard/lenovo/x200/cmos.layout
@@ -65,20 +65,19 @@ entries
413 1 e 1 wwan
414 1 e 1 wlan
415 1 e 1 trackpoint
-416 1 e 1 fn_ctrl_swap
-417 1 e 1 sticky_fn
+416 8 h 0 volume
+424 1 e 1 fn_ctrl_swap
+425 1 e 1 sticky_fn
+426 1 e 1 power_management_beeps
+927 1 e 1 low_battery_beep
+928 1 e 1 uwb
# coreboot config options: bootloader
-418 512 s 0 boot_devices
-930 8 h 0 boot_default
-
-938 1 e 1 power_management_beeps
-939 1 e 1 low_battery_beep
-940 1 e 1 uwb
+429 512 s 0 boot_devices
+944 8 h 0 boot_default
# coreboot config options: northbridge
-944 8 h 0 volume
-952 4 e 11 gfx_uma_size
+952 4 e 11 gfx_uma_size
# coreboot config options: check sums
984 16 h 0 check_sum
diff --git a/src/mainboard/msi/ms9652_fam10/cmos.layout b/src/mainboard/msi/ms9652_fam10/cmos.layout
index fe0ff4e..7fad0be 100644
--- a/src/mainboard/msi/ms9652_fam10/cmos.layout
+++ b/src/mainboard/msi/ms9652_fam10/cmos.layout
@@ -22,13 +22,14 @@ entries
384 1 e 4 boot_option
388 4 h 0 reboot_counter
393 3 e 5 baud_rate
-396 5 e 10 ecc_scrub_rate
+#396 5 unused
401 1 e 1 interleave_chip_selects
402 1 e 1 interleave_nodes
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
+416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
diff --git a/src/mainboard/pcengines/apu1/cmos.layout b/src/mainboard/pcengines/apu1/cmos.layout
index e0501f6..959a2d3 100644
--- a/src/mainboard/pcengines/apu1/cmos.layout
+++ b/src/mainboard/pcengines/apu1/cmos.layout
@@ -7,7 +7,8 @@ entries
392 1 e 2 boot_option
393 1 e 1 multi_core
394 3 e 3 baud_rate
-397 4 e 4 debug_level
+#397 3 unused
+400 4 e 4 debug_level
# leave 7 bits to make checksummed area end byte-aligned
408 16 h 0 check_sum
diff --git a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
index fe0ff4e..7fad0be 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
@@ -22,13 +22,14 @@ entries
384 1 e 4 boot_option
388 4 h 0 reboot_counter
393 3 e 5 baud_rate
-396 5 e 10 ecc_scrub_rate
+#396 5 unused
401 1 e 1 interleave_chip_selects
402 1 e 1 interleave_nodes
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
+416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
diff --git a/src/mainboard/supermicro/h8qme_fam10/cmos.layout b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
index fe0ff4e..7fad0be 100644
--- a/src/mainboard/supermicro/h8qme_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
@@ -22,13 +22,14 @@ entries
384 1 e 4 boot_option
388 4 h 0 reboot_counter
393 3 e 5 baud_rate
-396 5 e 10 ecc_scrub_rate
+#396 5 unused
401 1 e 1 interleave_chip_selects
402 1 e 1 interleave_nodes
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
+416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
diff --git a/src/mainboard/tyan/s2912_fam10/cmos.layout b/src/mainboard/tyan/s2912_fam10/cmos.layout
index fe0ff4e..7fad0be 100644
--- a/src/mainboard/tyan/s2912_fam10/cmos.layout
+++ b/src/mainboard/tyan/s2912_fam10/cmos.layout
@@ -22,13 +22,14 @@ entries
384 1 e 4 boot_option
388 4 h 0 reboot_counter
393 3 e 5 baud_rate
-396 5 e 10 ecc_scrub_rate
+#396 5 unused
401 1 e 1 interleave_chip_selects
402 1 e 1 interleave_nodes
403 1 e 1 interleave_memory_channels
404 2 e 8 max_mem_clock
406 1 e 2 multi_core
412 4 e 6 debug_level
+416 5 e 10 ecc_scrub_rate
440 4 e 9 slow_cpu
444 1 e 1 nmi
445 1 e 1 gart
More information about the coreboot-gerrit
mailing list