mb/**/cmos.layout: Indent everything with tabs

Time has shown that using spaces never converges into proper alignment.

Change-Id: I5338aeaf139580f9eab3e1e02cb910080a95d2c2
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47147
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>

20 files changed, 1168 insertions, 1168 deletions

diff --git a/src/mainboard/lenovo/g505s/cmos.layout b/src/mainboard/lenovo/g505s/cmos.layout
index d2e1f28bab..04ffe7e52b 100644
--- a/src/mainboard/lenovo/g505s/cmos.layout
+++ b/src/mainboard/lenovo/g505s/cmos.layout
@@ -5,50 +5,50 @@
 
 entries
 
-0          384       r       0        reserved_memory
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
-395          1       e       1        hw_scrubber
-396          1       e       1        interleave_chip_selects
-397          2       e       8        max_mem_clock
-399          1       e       2        multi_core
-#400         8       r       8        reserved for century byte
-408          1       e       1        power_on_after_fail
-412          4       e       6        debug_level
-440          4       e       9        slow_cpu
-444          1       e       1        nmi
-445          1       e       1        iommu
-456          1       e       1        ECC_memory
-728        256       h       0        user_data
-984         16       h       0        check_sum
+0	384	r	0	reserved_memory
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
+395	1	e	1	hw_scrubber
+396	1	e	1	interleave_chip_selects
+397	2	e	8	max_mem_clock
+399	1	e	2	multi_core
+#400	8	r	8	reserved for century byte
+408	1	e	1	power_on_after_fail
+412	4	e	6	debug_level
+440	4	e	9	slow_cpu
+444	1	e	1	nmi
+445	1	e	1	iommu
+456	1	e	1	ECC_memory
+728	256	h	0	user_data
+984	16	h	0	check_sum
 # Reserve the extended AMD configuration registers
-1000        24       r       0        amd_reserved
+1000	24	r	0	amd_reserved
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-8     0     400Mhz
-8     1     333Mhz
-8     2     266Mhz
-8     3     200Mhz
-9     0     off
-9     1     87.5%
-9     2     75.0%
-9     3     62.5%
-9     4     50.0%
-9     5     37.5%
-9     6     25.0%
-9     7     12.5%
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+8	0	400Mhz
+8	1	333Mhz
+8	2	266Mhz
+8	3	200Mhz
+9	0	off
+9	1	87.5%
+9	2	75.0%
+9	3	62.5%
+9	4	50.0%
+9	5	37.5%
+9	6	25.0%
+9	7	12.5%
 
 checksums
 
diff --git a/src/mainboard/lenovo/l520/cmos.layout b/src/mainboard/lenovo/l520/cmos.layout
index 0d5968c394..e96915d2d1 100644
--- a/src/mainboard/lenovo/l520/cmos.layout
+++ b/src/mainboard/lenovo/l520/cmos.layout
@@ -4,91 +4,91 @@
 entries
 
 # -----------------------------------------------------------------
-0          120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411         1       e       8        first_battery
-412         1       e       1        bluetooth
-413         1       e       1        wwan
-414         1       e       1        touchpad
-415         1       e       1        wlan
-416         1       e       1        trackpoint
-417         1       e       1        fn_ctrl_swap
-418         1       e       1        sticky_fn
-419         2       e       12       usb_always_on
-421         1       e       9        sata_mode
-422         2       e       10       backlight
+411	1	e	8	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	touchpad
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	2	e	12	usb_always_on
+421	1	e	9	sata_mode
+422	2	e	10	backlight
 
 # coreboot config options: cpu
 
 # coreboot config options: northbridge
-432         3        e      11        gfx_uma_size
-440         8        h       0        volume
+432	3	e	11	gfx_uma_size
+440	8	h	0	volume
 
 # SandyBridge MRC Scrambler Seed values
-896         32        r       0        mrc_scrambler_seed
-928         32        r       0        mrc_scrambler_seed_s3
-960         16        r       0        mrc_scrambler_seed_chk
+896	32	r	0	mrc_scrambler_seed
+928	32	r	0	mrc_scrambler_seed_s3
+960	16	r	0	mrc_scrambler_seed_chk
 
 # coreboot config options: check sums
-984         16       h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     Secondary
-8     1     Primary
-9     0     AHCI
-9     1     Compatible
-10    0     Both
-10    1     Keyboard only
-10    2     Thinklight only
-10    3     None
-11    0     32M
-11    1     64M
-11    2     96M
-11    3     128M
-11    4     160M
-11    5     192M
-11    6     224M
-12    0     Disable
-12    1     AC and battery
-12    2     AC only
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	Secondary
+8	1	Primary
+9	0	AHCI
+9	1	Compatible
+10	0	Both
+10	1	Keyboard only
+10	2	Thinklight only
+10	3	None
+11	0	32M
+11	1	64M
+11	2	96M
+11	3	128M
+11	4	160M
+11	5	192M
+11	6	224M
+12	0	Disable
+12	1	AC and battery
+12	2	AC only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/t400/cmos.layout b/src/mainboard/lenovo/t400/cmos.layout
index f5cf15c4f0..24038a7f87 100644
--- a/src/mainboard/lenovo/t400/cmos.layout
+++ b/src/mainboard/lenovo/t400/cmos.layout
@@ -4,94 +4,94 @@
 entries
 
 # -----------------------------------------------------------------
-0           120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384           1       e       4        boot_option
-388           4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395           4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400          8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408         1       e       10        sata_mode
-409         2       e       7         power_on_after_fail
+408	1	e	10	sata_mode
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411         1       e       9        first_battery
-412         1       e       1        bluetooth
-413         1       e       1        wwan
-414         1       e       1        wlan
-415         1       e       1        trackpoint
-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
-427         1       e       1        low_battery_beep
-428         1       e       1        uwb
+411	1	e	9	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	wlan
+415	1	e	1	trackpoint
+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
+427	1	e	1	low_battery_beep
+428	1	e	1	uwb
 
 # coreboot config options: bootloader
-432         512       s       0        boot_devices
-944           8       h       0        boot_default
+432	512	s	0	boot_devices
+944	8	h	0	boot_default
 
 # coreboot config options: northbridge
-952         2       e       12       hybrid_graphics_mode
-954         4       e       11       gfx_uma_size
+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
+984	16	h	0	check_sum
 
 # RAM initialization internal data
-1024        128       r       0        read_training_results
+1024	128	r	0	read_training_results
 
 # VBOOT
-1152         128       r      0        vbnv
+1152	128	r	0	vbnv
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     No
-8     1     Yes
-9     0     Secondary
-9     1     Primary
-10    0     AHCI
-10    1     Compatible
-11    4     32M
-11    5     48M
-11    6     64M
-11    7     128M
-11    8     256M
-11    9     96M
-11    10     160M
-11    11     224M
-11    12     352M
-12    0     Integrated Only
-12    1     Discrete Only
-12    2     Dual Graphics
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	No
+8	1	Yes
+9	0	Secondary
+9	1	Primary
+10	0	AHCI
+10	1	Compatible
+11	4	32M
+11	5	48M
+11	6	64M
+11	7	128M
+11	8	256M
+11	9	96M
+11	10	160M
+11	11	224M
+11	12	352M
+12	0	Integrated Only
+12	1	Discrete Only
+12	2	Dual Graphics
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/t410/cmos.layout b/src/mainboard/lenovo/t410/cmos.layout
index 0ca4d7af0e..71d65cee8d 100644
--- a/src/mainboard/lenovo/t410/cmos.layout
+++ b/src/mainboard/lenovo/t410/cmos.layout
@@ -4,85 +4,85 @@
 entries
 
 # -----------------------------------------------------------------
-0          120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411         1       e       8        first_battery
-412         1       e       1        bluetooth
-413         1       e       1        wwan
-414         1       e       1        touchpad
-415         1       e       1        wlan
-416         1       e       1        trackpoint
-417         1       e       1        fn_ctrl_swap
-418         1       e       1        sticky_fn
-419         1       e       1        power_management_beeps
-420         1       e       1        low_battery_beep
-421         1       e       9        sata_mode
-422         2       e       11       usb_always_on
+411	1	e	8	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	touchpad
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	1	e	1	power_management_beeps
+420	1	e	1	low_battery_beep
+421	1	e	9	sata_mode
+422	2	e	11	usb_always_on
 
 # coreboot config options: northbridge
-424         3       e       10       gfx_uma_size
-432          2        e       12       hybrid_graphics_mode
+424	3	e	10	gfx_uma_size
+432	2	e	12	hybrid_graphics_mode
 
 # VBOOT
-448          128     r       0        vbnv
+448	128	r	0	vbnv
 
 # coreboot config options: check sums
-984         16       h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     Secondary
-8     1     Primary
-9     0     AHCI
-9     1     Compatible
-10    0     32M
-10    1     48M
-10    2     64M
-10    3     128M
-10    5     96M
-10    6     160M
-11    0     Disable
-11    1     AC and battery
-11    2     AC only
-12    0     Integrated Only
-12    1     Discrete Only
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	Secondary
+8	1	Primary
+9	0	AHCI
+9	1	Compatible
+10	0	32M
+10	1	48M
+10	2	64M
+10	3	128M
+10	5	96M
+10	6	160M
+11	0	Disable
+11	1	AC and battery
+11	2	AC only
+12	0	Integrated Only
+12	1	Discrete Only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/t420/cmos.layout b/src/mainboard/lenovo/t420/cmos.layout
index 2f67013450..e1d15be56b 100644
--- a/src/mainboard/lenovo/t420/cmos.layout
+++ b/src/mainboard/lenovo/t420/cmos.layout
@@ -4,99 +4,99 @@
 entries
 
 # -----------------------------------------------------------------
-0            120     r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411          1       e       8        first_battery
-412          1       e       1        bluetooth
-413          1       e       1        wwan
-414          1       e       1        touchpad
-415          1       e       1        wlan
-416          1       e       1        trackpoint
-417          1       e       1        fn_ctrl_swap
-418          1       e       1        sticky_fn
-419          1       e       1        power_management_beeps
-421          1       e       9        sata_mode
-422          2       e       13       usb_always_on
+411	1	e	8	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	touchpad
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	1	e	1	power_management_beeps
+421	1	e	9	sata_mode
+422	2	e	13	usb_always_on
 
 # coreboot config options: cpu
 
 # coreboot config options: northbridge
-432          3       e       11       gfx_uma_size
-435          2       e       12       hybrid_graphics_mode
+432	3	e	11	gfx_uma_size
+435	2	e	12	hybrid_graphics_mode
 
-440          8       h       0        volume
+440	8	h	0	volume
 
 # VBOOT
-448          128     r       0        vbnv
+448	128	r	0	vbnv
 
 # SandyBridge MRC Scrambler Seed values
-896          32      r       0        mrc_scrambler_seed
-928          32      r       0        mrc_scrambler_seed_s3
-960          16      r       0        mrc_scrambler_seed_chk
+896	32	r	0	mrc_scrambler_seed
+928	32	r	0	mrc_scrambler_seed_s3
+960	16	r	0	mrc_scrambler_seed_chk
 
 # coreboot config options: check sums
-984          16      h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     Secondary
-8     1     Primary
-9     0     AHCI
-9     1     Compatible
-10    0     Both
-10    1     Keyboard only
-10    2     Thinklight only
-10    3     None
-11    0     32M
-11    1     64M
-11    2     96M
-11    3     128M
-11    4     160M
-11    5     192M
-11    6     224M
-12    0     Integrated Only
-12    1     Discrete Only
-12    2     Dual Graphics
-13    0     Disable
-13    1     AC and battery
-13    2     AC only
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	Secondary
+8	1	Primary
+9	0	AHCI
+9	1	Compatible
+10	0	Both
+10	1	Keyboard only
+10	2	Thinklight only
+10	3	None
+11	0	32M
+11	1	64M
+11	2	96M
+11	3	128M
+11	4	160M
+11	5	192M
+11	6	224M
+12	0	Integrated Only
+12	1	Discrete Only
+12	2	Dual Graphics
+13	0	Disable
+13	1	AC and battery
+13	2	AC only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/t420s/cmos.layout b/src/mainboard/lenovo/t420s/cmos.layout
index 2f67013450..e1d15be56b 100644
--- a/src/mainboard/lenovo/t420s/cmos.layout
+++ b/src/mainboard/lenovo/t420s/cmos.layout
@@ -4,99 +4,99 @@
 entries
 
 # -----------------------------------------------------------------
-0            120     r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411          1       e       8        first_battery
-412          1       e       1        bluetooth
-413          1       e       1        wwan
-414          1       e       1        touchpad
-415          1       e       1        wlan
-416          1       e       1        trackpoint
-417          1       e       1        fn_ctrl_swap
-418          1       e       1        sticky_fn
-419          1       e       1        power_management_beeps
-421          1       e       9        sata_mode
-422          2       e       13       usb_always_on
+411	1	e	8	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	touchpad
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	1	e	1	power_management_beeps
+421	1	e	9	sata_mode
+422	2	e	13	usb_always_on
 
 # coreboot config options: cpu
 
 # coreboot config options: northbridge
-432          3       e       11       gfx_uma_size
-435          2       e       12       hybrid_graphics_mode
+432	3	e	11	gfx_uma_size
+435	2	e	12	hybrid_graphics_mode
 
-440          8       h       0        volume
+440	8	h	0	volume
 
 # VBOOT
-448          128     r       0        vbnv
+448	128	r	0	vbnv
 
 # SandyBridge MRC Scrambler Seed values
-896          32      r       0        mrc_scrambler_seed
-928          32      r       0        mrc_scrambler_seed_s3
-960          16      r       0        mrc_scrambler_seed_chk
+896	32	r	0	mrc_scrambler_seed
+928	32	r	0	mrc_scrambler_seed_s3
+960	16	r	0	mrc_scrambler_seed_chk
 
 # coreboot config options: check sums
-984          16      h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     Secondary
-8     1     Primary
-9     0     AHCI
-9     1     Compatible
-10    0     Both
-10    1     Keyboard only
-10    2     Thinklight only
-10    3     None
-11    0     32M
-11    1     64M
-11    2     96M
-11    3     128M
-11    4     160M
-11    5     192M
-11    6     224M
-12    0     Integrated Only
-12    1     Discrete Only
-12    2     Dual Graphics
-13    0     Disable
-13    1     AC and battery
-13    2     AC only
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	Secondary
+8	1	Primary
+9	0	AHCI
+9	1	Compatible
+10	0	Both
+10	1	Keyboard only
+10	2	Thinklight only
+10	3	None
+11	0	32M
+11	1	64M
+11	2	96M
+11	3	128M
+11	4	160M
+11	5	192M
+11	6	224M
+12	0	Integrated Only
+12	1	Discrete Only
+12	2	Dual Graphics
+13	0	Disable
+13	1	AC and battery
+13	2	AC only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/t430/cmos.layout b/src/mainboard/lenovo/t430/cmos.layout
index e3d3c92ba3..dd51c36854 100644
--- a/src/mainboard/lenovo/t430/cmos.layout
+++ b/src/mainboard/lenovo/t430/cmos.layout
@@ -4,98 +4,98 @@
 entries
 
 # -----------------------------------------------------------------
-0            120     r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411          1       e       8        first_battery
-412          1       e       1        bluetooth
-413          1       e       1        wwan
-414          1       e       1        touchpad
-415          1       e       1        wlan
-416          1       e       1        trackpoint
-417          1       e       1        fn_ctrl_swap
-418          1       e       1        sticky_fn
-419          2       e       13       usb_always_on
-421          1       e       9        sata_mode
-422          2       e       10       backlight
+411	1	e	8	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	touchpad
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	2	e	13	usb_always_on
+421	1	e	9	sata_mode
+422	2	e	10	backlight
 
 # coreboot config options: cpu
 
 # coreboot config options: northbridge
-432          3       e       11       gfx_uma_size
-435         2        e       12       hybrid_graphics_mode
-440          8       h       0        volume
+432	3	e	11	gfx_uma_size
+435	2	e	12	hybrid_graphics_mode
+440	8	h	0	volume
 
 # VBOOT
-448          128     r       0        vbnv
+448	128	r	0	vbnv
 
 # SandyBridge MRC Scrambler Seed values
-896          32      r       0        mrc_scrambler_seed
-928          32      r       0        mrc_scrambler_seed_s3
-960          16      r       0        mrc_scrambler_seed_chk
+896	32	r	0	mrc_scrambler_seed
+928	32	r	0	mrc_scrambler_seed_s3
+960	16	r	0	mrc_scrambler_seed_chk
 
 # coreboot config options: check sums
-984          16      h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     Secondary
-8     1     Primary
-9     0     AHCI
-9     1     Compatible
-10    0     Both
-10    1     Keyboard only
-10    2     Thinklight only
-10    3     None
-11    0     32M
-11    1     64M
-11    2     96M
-11    3     128M
-11    4     160M
-11    5     192M
-11    6     224M
-12    0     Integrated Only
-12    1     Discrete Only
-12    2     Dual Graphics
-13    0     Disable
-13    1     AC and battery
-13    2     AC only
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	Secondary
+8	1	Primary
+9	0	AHCI
+9	1	Compatible
+10	0	Both
+10	1	Keyboard only
+10	2	Thinklight only
+10	3	None
+11	0	32M
+11	1	64M
+11	2	96M
+11	3	128M
+11	4	160M
+11	5	192M
+11	6	224M
+12	0	Integrated Only
+12	1	Discrete Only
+12	2	Dual Graphics
+13	0	Disable
+13	1	AC and battery
+13	2	AC only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/t430s/cmos.layout b/src/mainboard/lenovo/t430s/cmos.layout
index 0b7230341a..02c1ea78df 100644
--- a/src/mainboard/lenovo/t430s/cmos.layout
+++ b/src/mainboard/lenovo/t430s/cmos.layout
@@ -4,96 +4,96 @@
 entries
 
 # -----------------------------------------------------------------
-0            120     r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411          1       e       8        first_battery
-412          1       e       1        bluetooth
-413          1       e       1        wwan
-414          1       e       1        touchpad
-415          1       e       1        wlan
-416          1       e       1        trackpoint
-417          1       e       1        fn_ctrl_swap
-418          1       e       1        sticky_fn
-419          2       e       12       usb_always_on
-421          1       e       9        sata_mode
-422          2       e       10       backlight
-424          1       e       1        f1_to_f12_as_primary
+411	1	e	8	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	touchpad
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	2	e	12	usb_always_on
+421	1	e	9	sata_mode
+422	2	e	10	backlight
+424	1	e	1	f1_to_f12_as_primary
 
 # coreboot config options: cpu
 
 # coreboot config options: northbridge
-432          3       e       11       gfx_uma_size
-435          1       e       1        enable_dual_graphics
-440          8       h       0        volume
+432	3	e	11	gfx_uma_size
+435	1	e	1	enable_dual_graphics
+440	8	h	0	volume
 
 # VBOOT
-448          128     r       0        vbnv
+448	128	r	0	vbnv
 
 # SandyBridge MRC Scrambler Seed values
-896          32      r       0        mrc_scrambler_seed
-928          32      r       0        mrc_scrambler_seed_s3
-960          16      r       0        mrc_scrambler_seed_chk
+896	32	r	0	mrc_scrambler_seed
+928	32	r	0	mrc_scrambler_seed_s3
+960	16	r	0	mrc_scrambler_seed_chk
 
 # coreboot config options: check sums
-984          16      h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     Secondary
-8     1     Primary
-9     0     AHCI
-9     1     Compatible
-10    0     Both
-10    1     Keyboard only
-10    2     Thinklight only
-10    3     None
-11    0     32M
-11    1     64M
-11    2     96M
-11    3     128M
-11    4     160M
-11    5     192M
-11    6     224M
-12    0     Disable
-12    1     AC and battery
-12    2     AC only
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	Secondary
+8	1	Primary
+9	0	AHCI
+9	1	Compatible
+10	0	Both
+10	1	Keyboard only
+10	2	Thinklight only
+10	3	None
+11	0	32M
+11	1	64M
+11	2	96M
+11	3	128M
+11	4	160M
+11	5	192M
+11	6	224M
+12	0	Disable
+12	1	AC and battery
+12	2	AC only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/t440p/cmos.layout b/src/mainboard/lenovo/t440p/cmos.layout
index 4287eead03..464d24277b 100644
--- a/src/mainboard/lenovo/t440p/cmos.layout
+++ b/src/mainboard/lenovo/t440p/cmos.layout
@@ -4,78 +4,78 @@
 entries
 
 # -----------------------------------------------------------------
-0            120     r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411          1       e       8        first_battery
-415          1       e       1        wlan
-416          1       e       1        trackpoint
-417          1       e       1        fn_ctrl_swap
-418          1       e       1        sticky_fn
-419          2       e       13       usb_always_on
-422          2       e       10       backlight
-424          1       e       1        f1_to_f12_as_primary
+411	1	e	8	first_battery
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	2	e	13	usb_always_on
+422	2	e	10	backlight
+424	1	e	1	f1_to_f12_as_primary
 
 # coreboot config options: northbridge
-435         1        e       1        enable_dual_graphics
-440          8       h       0        volume
+435	1	e	1	enable_dual_graphics
+440	8	h	0	volume
 
 # VBOOT
-448          128     r       0        vbnv
+448	128	r	0	vbnv
 
 # coreboot config options: check sums
-984          16      h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     Secondary
-8     1     Primary
-9     0     AHCI
-9     1     Compatible
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	Secondary
+8	1	Primary
+9	0	AHCI
+9	1	Compatible
 # Haswell ThinkPads have no Thinklight
-#10    0     Both
-10    1     Keyboard
-#10    2     Thinklight only
-10    3     None
-13    0     Disable
-13    1     AC and battery
-13    2     AC only
+#10	0	Both
+10	1	Keyboard
+#10	2	Thinklight only
+10	3	None
+13	0	Disable
+13	1	AC and battery
+13	2	AC only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/t520/cmos.layout b/src/mainboard/lenovo/t520/cmos.layout
index 4f657fdc3f..dd51c36854 100644
--- a/src/mainboard/lenovo/t520/cmos.layout
+++ b/src/mainboard/lenovo/t520/cmos.layout
@@ -4,98 +4,98 @@
 entries
 
 # -----------------------------------------------------------------
-0          120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411         1       e       8        first_battery
-412         1       e       1        bluetooth
-413         1       e       1        wwan
-414         1       e       1        touchpad
-415         1       e       1        wlan
-416         1       e       1        trackpoint
-417         1       e       1        fn_ctrl_swap
-418         1       e       1        sticky_fn
-419         2       e       13       usb_always_on
-421         1       e       9        sata_mode
-422         2       e       10       backlight
+411	1	e	8	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	touchpad
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	2	e	13	usb_always_on
+421	1	e	9	sata_mode
+422	2	e	10	backlight
 
 # coreboot config options: cpu
 
 # coreboot config options: northbridge
-432         3        e      11        gfx_uma_size
-435         2        e       12       hybrid_graphics_mode
-440         8        h       0        volume
+432	3	e	11	gfx_uma_size
+435	2	e	12	hybrid_graphics_mode
+440	8	h	0	volume
 
 # VBOOT
-448        128       r        0        vbnv
+448	128	r	0	vbnv
 
 # SandyBridge MRC Scrambler Seed values
-896         32        r       0        mrc_scrambler_seed
-928         32        r       0        mrc_scrambler_seed_s3
-960         16        r       0        mrc_scrambler_seed_chk
+896	32	r	0	mrc_scrambler_seed
+928	32	r	0	mrc_scrambler_seed_s3
+960	16	r	0	mrc_scrambler_seed_chk
 
 # coreboot config options: check sums
-984         16       h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     Secondary
-8     1     Primary
-9     0     AHCI
-9     1     Compatible
-10    0     Both
-10    1     Keyboard only
-10    2     Thinklight only
-10    3     None
-11    0     32M
-11    1     64M
-11    2     96M
-11    3     128M
-11    4     160M
-11    5     192M
-11    6     224M
-12    0     Integrated Only
-12    1     Discrete Only
-12    2     Dual Graphics
-13    0     Disable
-13    1     AC and battery
-13    2     AC only
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	Secondary
+8	1	Primary
+9	0	AHCI
+9	1	Compatible
+10	0	Both
+10	1	Keyboard only
+10	2	Thinklight only
+10	3	None
+11	0	32M
+11	1	64M
+11	2	96M
+11	3	128M
+11	4	160M
+11	5	192M
+11	6	224M
+12	0	Integrated Only
+12	1	Discrete Only
+12	2	Dual Graphics
+13	0	Disable
+13	1	AC and battery
+13	2	AC only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/t530/cmos.layout b/src/mainboard/lenovo/t530/cmos.layout
index a3b0f0637c..6cd8ac066b 100644
--- a/src/mainboard/lenovo/t530/cmos.layout
+++ b/src/mainboard/lenovo/t530/cmos.layout
@@ -4,99 +4,99 @@
 entries
 
 # -----------------------------------------------------------------
-0          120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411         1       e       8        first_battery
-412         1       e       1        bluetooth
-413         1       e       1        wwan
-414         1       e       1        touchpad
-415         1       e       1        wlan
-416         1       e       1        trackpoint
-417         1       e       1        fn_ctrl_swap
-418         1       e       1        sticky_fn
-419         2       e       13       usb_always_on
-421         1       e       9        sata_mode
-422         2       e       10       backlight
+411	1	e	8	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	touchpad
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	2	e	13	usb_always_on
+421	1	e	9	sata_mode
+422	2	e	10	backlight
 
 # coreboot config options: cpu
 
 # coreboot config options: northbridge
-432         3        e      11        gfx_uma_size
-435         2        e       12       hybrid_graphics_mode
+432	3	e	11	gfx_uma_size
+435	2	e	12	hybrid_graphics_mode
 
-440          8       h       0        volume
+440	8	h	0	volume
 
 # VBOOT
-448          128     r       0        vbnv
+448	128	r	0	vbnv
 
 # SandyBridge MRC Scrambler Seed values
-896         32        r       0        mrc_scrambler_seed
-928         32        r       0        mrc_scrambler_seed_s3
-960         16        r       0        mrc_scrambler_seed_chk
+896	32	r	0	mrc_scrambler_seed
+928	32	r	0	mrc_scrambler_seed_s3
+960	16	r	0	mrc_scrambler_seed_chk
 
 # coreboot config options: check sums
-984         16       h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     Secondary
-8     1     Primary
-9     0     AHCI
-9     1     Compatible
-10    0     Both
-10    1     Keyboard only
-10    2     Thinklight only
-10    3     None
-11    0     32M
-11    1     64M
-11    2     96M
-11    3     128M
-11    4     160M
-11    5     192M
-11    6     224M
-12    0     Integrated Only
-12    1     Discrete Only
-12    2     Dual Graphics
-13    0     Disable
-13    1     AC and battery
-13    2     AC only
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	Secondary
+8	1	Primary
+9	0	AHCI
+9	1	Compatible
+10	0	Both
+10	1	Keyboard only
+10	2	Thinklight only
+10	3	None
+11	0	32M
+11	1	64M
+11	2	96M
+11	3	128M
+11	4	160M
+11	5	192M
+11	6	224M
+12	0	Integrated Only
+12	1	Discrete Only
+12	2	Dual Graphics
+13	0	Disable
+13	1	AC and battery
+13	2	AC only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout
index 62f5dbab03..2af6365f6f 100644
--- a/src/mainboard/lenovo/t60/cmos.layout
+++ b/src/mainboard/lenovo/t60/cmos.layout
@@ -4,90 +4,90 @@
 entries
 
 # -----------------------------------------------------------------
-0          120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-#409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+#409	2	e	7	power_on_after_fail
 
 # coreboot config options: northbridge
-411         3       e       11       gfx_uma_size
+411	3	e	11	gfx_uma_size
 
 # coreboot config options: bootloader
-416        512       s       0        boot_devices
-928          8       h       0        boot_default
-936          1       e       8        cmos_defaults_loaded
-937          1       e       1        lpt
+416	512	s	0	boot_devices
+928	8	h	0	boot_default
+936	1	e	8	cmos_defaults_loaded
+937	1	e	1	lpt
 
 # coreboot config options: cpu
 
 # coreboot config options: ec
-948         1       e       1        touchpad
-949         1       e       1        bluetooth
-950         1       e       1        wwan
-951         1       e       1        wlan
-952         8       h       0        volume
-960         1       e       9        first_battery
-961         1       e       1        trackpoint
-963         1       e       1        sticky_fn
-964         1       e       1        power_management_beeps
-965         1       e       1        low_battery_beep
+948	1	e	1	touchpad
+949	1	e	1	bluetooth
+950	1	e	1	wwan
+951	1	e	1	wlan
+952	8	h	0	volume
+960	1	e	9	first_battery
+961	1	e	1	trackpoint
+963	1	e	1	sticky_fn
+964	1	e	1	power_management_beeps
+965	1	e	1	low_battery_beep
 
 # coreboot config options: check sums
-984         16       h       0        check_sum
+984	16	h	0	check_sum
 
 # RAM initialization internal data
-1024         8       r       0        C0WL0REOST
-1032         8       r       0        C1WL0REOST
-1040         8       r       0        RCVENMT
-1048         4       r       0        C0DRT1
-1052         4       r       0        C1DRT1
+1024	8	r	0	C0WL0REOST
+1032	8	r	0	C1WL0REOST
+1040	8	r	0	RCVENMT
+1048	4	r	0	C0DRT1
+1052	4	r	0	C1DRT1
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     No
-8     1     Yes
-9     0     Secondary
-9     1     Primary
-11    0     1M
-11    1     4M
-11    2     8M
-11    3     16M
-11    4     32M
-11    5     48M
-11    6     64M
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	No
+8	1	Yes
+9	0	Secondary
+9	1	Primary
+11	0	1M
+11	1	4M
+11	2	8M
+11	3	16M
+11	4	32M
+11	5	48M
+11	6	64M
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/thinkcentre_a58/cmos.layout b/src/mainboard/lenovo/thinkcentre_a58/cmos.layout
index cbf83229c9..11a078e35c 100644
--- a/src/mainboard/lenovo/thinkcentre_a58/cmos.layout
+++ b/src/mainboard/lenovo/thinkcentre_a58/cmos.layout
@@ -4,59 +4,59 @@
 entries
 
 # -----------------------------------------------------------------
-0          120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: cpu
 
 # coreboot config options: northbridge
-432         4        e      11        gfx_uma_size
+432	4	e	11	gfx_uma_size
 
 # coreboot config options: check sums
-984         16       h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     1     Emergency
-6     2     Alert
-6     3     Critical
-6     4     Error
-6     5     Warning
-6     6     Notice
-6     7     Info
-6     8     Debug
-6     9     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-11    6     64M
-11    7     128M
-11    8     256M
-11    9     96M
-11    10     160M
-11    11     224M
-11    12     352M
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	1	Emergency
+6	2	Alert
+6	3	Critical
+6	4	Error
+6	5	Warning
+6	6	Notice
+6	7	Info
+6	8	Debug
+6	9	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+11	6	64M
+11	7	128M
+11	8	256M
+11	9	96M
+11	10	160M
+11	11	224M
+11	12	352M
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/x131e/cmos.layout b/src/mainboard/lenovo/x131e/cmos.layout
index 2b6253cde0..b9da70dd08 100644
--- a/src/mainboard/lenovo/x131e/cmos.layout
+++ b/src/mainboard/lenovo/x131e/cmos.layout
@@ -4,87 +4,87 @@
 entries
 
 # -----------------------------------------------------------------
-0          120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
-411          1       e       8        sata_mode
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
+411	1	e	8	sata_mode
 
 # coreboot config options: EC
-412         1       e       1        bluetooth
-413         1       e       1        wwan
-414         1       e       1        touchpad
-415         1       e       1        wlan
-416         1       e       1        trackpoint
-417         1       e       1        fn_ctrl_swap
-418         1       e       1        sticky_fn
-419         2       e       12       usb_always_on
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	touchpad
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	2	e	12	usb_always_on
 
 # coreboot config options: cpu
 
 # coreboot config options: northbridge
-432         3        e       11       gfx_uma_size
+432	3	e	11	gfx_uma_size
 
-440          8       h       0        volume
+440	8	h	0	volume
 
 # VBOOT
-448          128     r       0        vbnv
+448	128	r	0	vbnv
 
 # SandyBridge MRC Scrambler Seed values
-896         32        r       0        mrc_scrambler_seed
-928         32        r       0        mrc_scrambler_seed_s3
-960         16        r       0        mrc_scrambler_seed_chk
+896	32	r	0	mrc_scrambler_seed
+928	32	r	0	mrc_scrambler_seed_s3
+960	16	r	0	mrc_scrambler_seed_chk
 
 # coreboot config options: check sums
-984         16       h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     AHCI
-8     1     Compatible
-11    0     32M
-11    1     64M
-11    2     96M
-11    3     128M
-11    4     160M
-11    5     192M
-11    6     224M
-12    0     Disable
-12    1     AC and battery
-12    2     AC only
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	AHCI
+8	1	Compatible
+11	0	32M
+11	1	64M
+11	2	96M
+11	3	128M
+11	4	160M
+11	5	192M
+11	6	224M
+12	0	Disable
+12	1	AC and battery
+12	2	AC only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout b/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout
index e2abae6859..90a08b081a 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout
+++ b/src/mainboard/lenovo/x1_carbon_gen1/cmos.layout
@@ -4,95 +4,95 @@
 entries
 
 # -----------------------------------------------------------------
-0          120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411         1       e       8        first_battery
-412         1       e       1        bluetooth
-413         1       e       1        wwan
-414         1       e       1        touchpad
-415         1       e       1        wlan
-416         1       e       1        trackpoint
-417         1       e       1        fn_ctrl_swap
-418         1       e       1        sticky_fn
-419         2       e      12        usb_always_on
-421         1       e       9        sata_mode
-422         2       e      10        backlight
+411	1	e	8	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	touchpad
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	2	e	12	usb_always_on
+421	1	e	9	sata_mode
+422	2	e	10	backlight
 
 # coreboot config options: cpu
 
 # coreboot config options: northbridge
-432         3        e      11        gfx_uma_size
+432	3	e	11	gfx_uma_size
 
-440          8       h       0        volume
+440	8	h	0	volume
 
 # VBOOT
-448         128      r        0        vbnv
+448	128	r	0	vbnv
 
 # SandyBridge MRC Scrambler Seed values
-896         32        r       0        mrc_scrambler_seed
-928         32        r       0        mrc_scrambler_seed_s3
-960         16        r       0        mrc_scrambler_seed_chk
+896	32	r	0	mrc_scrambler_seed
+928	32	r	0	mrc_scrambler_seed_s3
+960	16	r	0	mrc_scrambler_seed_chk
 
 # coreboot config options: check sums
-984         16       h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     Secondary
-8     1     Primary
-9     0     AHCI
-9     1     Compatible
-10    0     Both
-10    1     Keyboard only
-10    2     Thinklight only
-10    3     None
-11    0     32M
-11    1     64M
-11    2     96M
-11    3     128M
-11    4     160M
-11    5     192M
-11    6     224M
-12    0     Disable
-12    1     AC and battery
-12    2     AC only
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	Secondary
+8	1	Primary
+9	0	AHCI
+9	1	Compatible
+10	0	Both
+10	1	Keyboard only
+10	2	Thinklight only
+10	3	None
+11	0	32M
+11	1	64M
+11	2	96M
+11	3	128M
+11	4	160M
+11	5	192M
+11	6	224M
+12	0	Disable
+12	1	AC and battery
+12	2	AC only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/x200/cmos.layout b/src/mainboard/lenovo/x200/cmos.layout
index e300bdf5e8..afd5461af5 100644
--- a/src/mainboard/lenovo/x200/cmos.layout
+++ b/src/mainboard/lenovo/x200/cmos.layout
@@ -4,90 +4,90 @@
 entries
 
 # -----------------------------------------------------------------
-0           120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384           1       e       4        boot_option
-388           4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395           4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400          8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408         1       e       10        sata_mode
-409         2       e       7         power_on_after_fail
+408	1	e	10	sata_mode
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411         1       e       9        first_battery
-412         1       e       1        bluetooth
-413         1       e       1        wwan
-414         1       e       1        wlan
-415         1       e       1        trackpoint
-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
-427         1       e       1        low_battery_beep
-428         1       e       1        uwb
+411	1	e	9	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	wlan
+415	1	e	1	trackpoint
+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
+427	1	e	1	low_battery_beep
+428	1	e	1	uwb
 
 # coreboot config options: bootloader
-432         512       s       0        boot_devices
-944           8       h       0        boot_default
+432	512	s	0	boot_devices
+944	8	h	0	boot_default
 
 # coreboot config options: northbridge
-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
+984	16	h	0	check_sum
 
 # RAM initialization internal data
-1024        128       r       0        read_training_results
+1024	128	r	0	read_training_results
 
 # VBOOT
-1152         128       r      0        vbnv
+1152	128	r	0	vbnv
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     No
-8     1     Yes
-9     0     Secondary
-9     1     Primary
-10    0     AHCI
-10    1     Compatible
-11    4     32M
-11    5     48M
-11    6     64M
-11    7     128M
-11    8     256M
-11    9     96M
-11    10    160M
-11    11    224M
-11    12    352M
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	No
+8	1	Yes
+9	0	Secondary
+9	1	Primary
+10	0	AHCI
+10	1	Compatible
+11	4	32M
+11	5	48M
+11	6	64M
+11	7	128M
+11	8	256M
+11	9	96M
+11	10	160M
+11	11	224M
+11	12	352M
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout
index a8c1d7969a..4ca1ade9b4 100644
--- a/src/mainboard/lenovo/x201/cmos.layout
+++ b/src/mainboard/lenovo/x201/cmos.layout
@@ -4,83 +4,83 @@
 entries
 
 # -----------------------------------------------------------------
-0          120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411         1       e       8        first_battery
-412         1       e       1        bluetooth
-413         1       e       1        wwan
-414         1       e       1        touchpad
-415         1       e       1        wlan
-416         1       e       1        trackpoint
-417         1       e       1        fn_ctrl_swap
-418         1       e       1        sticky_fn
-419         1       e       1        power_management_beeps
-420         1       e       1        low_battery_beep
-421         1       e       9        sata_mode
-422         2       e       11       usb_always_on
+411	1	e	8	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	touchpad
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	1	e	1	power_management_beeps
+420	1	e	1	low_battery_beep
+421	1	e	9	sata_mode
+422	2	e	11	usb_always_on
 
 # coreboot config options: northbridge
-424         3       e       10       gfx_uma_size
-432          8       h       0        volume
+424	3	e	10	gfx_uma_size
+432	8	h	0	volume
 
 # VBOOT
-448         128       r      0        vbnv
+448	128	r	0	vbnv
 
 # coreboot config options: check sums
-984         16       h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     Secondary
-8     1     Primary
-9     0     AHCI
-9     1     Compatible
-10    0     32M
-10    1     48M
-10    2     64M
-10    3     128M
-10    5     96M
-10    6     160M
-11    0     Disable
-11    1     AC and battery
-11    2     AC only
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	Secondary
+8	1	Primary
+9	0	AHCI
+9	1	Compatible
+10	0	32M
+10	1	48M
+10	2	64M
+10	3	128M
+10	5	96M
+10	6	160M
+11	0	Disable
+11	1	AC and battery
+11	2	AC only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/x220/cmos.layout b/src/mainboard/lenovo/x220/cmos.layout
index ec4cbcbe3e..f152b2982a 100644
--- a/src/mainboard/lenovo/x220/cmos.layout
+++ b/src/mainboard/lenovo/x220/cmos.layout
@@ -4,94 +4,94 @@
 entries
 
 # -----------------------------------------------------------------
-0          120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411         1       e       8        first_battery
-412         1       e       1        bluetooth
-413         1       e       1        wwan
-414         1       e       1        touchpad
-415         1       e       1        wlan
-416         1       e       1        trackpoint
-417         1       e       1        fn_ctrl_swap
-418         1       e       1        sticky_fn
-419         1       e       1        power_management_beeps
-421         1       e       9        sata_mode
-422         2       e       12       usb_always_on
+411	1	e	8	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	touchpad
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	1	e	1	power_management_beeps
+421	1	e	9	sata_mode
+422	2	e	12	usb_always_on
 
 # coreboot config options: cpu
 
 # coreboot config options: northbridge
-432         3        e      11        gfx_uma_size
-440         8       h       0        volume
+432	3	e	11	gfx_uma_size
+440	8	h	0	volume
 
 # VBOOT
-448         128       r      0        vbnv
+448	128	r	0	vbnv
 
 # SandyBridge MRC Scrambler Seed values
-896         32        r       0        mrc_scrambler_seed
-928         32        r       0        mrc_scrambler_seed_s3
-960         16        r       0        mrc_scrambler_seed_chk
+896	32	r	0	mrc_scrambler_seed
+928	32	r	0	mrc_scrambler_seed_s3
+960	16	r	0	mrc_scrambler_seed_chk
 
 # coreboot config options: check sums
-984         16       h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     Secondary
-8     1     Primary
-9     0     AHCI
-9     1     Compatible
-10    0     Both
-10    1     Keyboard only
-10    2     Thinklight only
-10    3     None
-11    0     32M
-11    1     64M
-11    2     96M
-11    3     128M
-11    4     160M
-11    5     192M
-11    6     224M
-12    0     Disable
-12    1     AC and battery
-12    2     AC only
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	Secondary
+8	1	Primary
+9	0	AHCI
+9	1	Compatible
+10	0	Both
+10	1	Keyboard only
+10	2	Thinklight only
+10	3	None
+11	0	32M
+11	1	64M
+11	2	96M
+11	3	128M
+11	4	160M
+11	5	192M
+11	6	224M
+12	0	Disable
+12	1	AC and battery
+12	2	AC only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/x230/cmos.layout b/src/mainboard/lenovo/x230/cmos.layout
index 30845d2db8..89891bf0b0 100644
--- a/src/mainboard/lenovo/x230/cmos.layout
+++ b/src/mainboard/lenovo/x230/cmos.layout
@@ -4,96 +4,96 @@
 entries
 
 # -----------------------------------------------------------------
-0          120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+409	2	e	7	power_on_after_fail
 
 # coreboot config options: EC
-411         1       e       8        first_battery
-412         1       e       1        bluetooth
-413         1       e       1        wwan
-414         1       e       1        touchpad
-415         1       e       1        wlan
-416         1       e       1        trackpoint
-417         1       e       1        fn_ctrl_swap
-418         1       e       1        sticky_fn
-419         2       e       12       usb_always_on
-421         1       e       9        sata_mode
-422         2       e       10       backlight
-424         1       e       1        f1_to_f12_as_primary
+411	1	e	8	first_battery
+412	1	e	1	bluetooth
+413	1	e	1	wwan
+414	1	e	1	touchpad
+415	1	e	1	wlan
+416	1	e	1	trackpoint
+417	1	e	1	fn_ctrl_swap
+418	1	e	1	sticky_fn
+419	2	e	12	usb_always_on
+421	1	e	9	sata_mode
+422	2	e	10	backlight
+424	1	e	1	f1_to_f12_as_primary
 
 # coreboot config options: cpu
 
 # coreboot config options: northbridge
-432         3        e      11        gfx_uma_size
+432	3	e	11	gfx_uma_size
 
-440          8       h       0        volume
+440	8	h	0	volume
 
 # VBOOT
-448          128     r       0        vbnv
+448	128	r	0	vbnv
 
 # SandyBridge MRC Scrambler Seed values
-896         32        r       0        mrc_scrambler_seed
-928         32        r       0        mrc_scrambler_seed_s3
-960         16        r       0        mrc_scrambler_seed_chk
+896	32	r	0	mrc_scrambler_seed
+928	32	r	0	mrc_scrambler_seed_s3
+960	16	r	0	mrc_scrambler_seed_chk
 
 # coreboot config options: check sums
-984         16       h       0        check_sum
+984	16	h	0	check_sum
 
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     Secondary
-8     1     Primary
-9     0     AHCI
-9     1     Compatible
-10    0     Both
-10    1     Keyboard only
-10    2     Thinklight only
-10    3     None
-11    0     32M
-11    1     64M
-11    2     96M
-11    3     128M
-11    4     160M
-11    5     192M
-11    6     224M
-12    0     Disable
-12    1     AC and battery
-12    2     AC only
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	Secondary
+8	1	Primary
+9	0	AHCI
+9	1	Compatible
+10	0	Both
+10	1	Keyboard only
+10	2	Thinklight only
+10	3	None
+11	0	32M
+11	1	64M
+11	2	96M
+11	3	128M
+11	4	160M
+11	5	192M
+11	6	224M
+12	0	Disable
+12	1	AC and battery
+12	2	AC only
 
 # -----------------------------------------------------------------
 checksums
diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout
index dcddc69cd2..61ab465694 100644
--- a/src/mainboard/lenovo/x60/cmos.layout
+++ b/src/mainboard/lenovo/x60/cmos.layout
@@ -4,91 +4,91 @@
 entries
 
 # -----------------------------------------------------------------
-0          120       r       0        reserved_memory
+0	120	r	0	reserved_memory
 
 # -----------------------------------------------------------------
 # RTC_BOOT_BYTE (coreboot hardcoded)
-384          1       e       4        boot_option
-388          4       h       0        reboot_counter
+384	1	e	4	boot_option
+388	4	h	0	reboot_counter
 
 # -----------------------------------------------------------------
 # coreboot config options: console
-395          4       e       6        debug_level
+395	4	e	6	debug_level
 
-#400         8       r       0        reserved for century byte
+#400	8	r	0	reserved for century byte
 
 # coreboot config options: southbridge
-408          1       e       1        nmi
-#409          2       e       7        power_on_after_fail
+408	1	e	1	nmi
+#409	2	e	7	power_on_after_fail
 
 # coreboot config options: northbridge
-411         3       e       11       gfx_uma_size
+411	3	e	11	gfx_uma_size
 
 # coreboot config options: bootloader
-416        512       s       0        boot_devices
-928          8       h       0        boot_default
-936          1       e       8        cmos_defaults_loaded
-937          1       e       1        lpt
+416	512	s	0	boot_devices
+928	8	h	0	boot_default
+936	1	e	8	cmos_defaults_loaded
+937	1	e	1	lpt
 
 # coreboot config options: cpu
 
 # coreboot config options: ec
-949         1       e       9        first_battery
-950         1       e       1        bluetooth
-951         1       e       1        wwan
-952         1       e       1        wlan
-953         1       e       1        trackpoint
-955         1       e       1        sticky_fn
-956         1       e       1        power_management_beeps
-959         1       e       1        low_battery_beep
-960         8       h       0        volume
-968         8       h       0        tft_brightness
+949	1	e	9	first_battery
+950	1	e	1	bluetooth
+951	1	e	1	wwan
+952	1	e	1	wlan
+953	1	e	1	trackpoint
+955	1	e	1	sticky_fn
+956	1	e	1	power_management_beeps
+959	1	e	1	low_battery_beep
+960	8	h	0	volume
+968	8	h	0	tft_brightness
 
 # coreboot config options: check sums
-984         16       h       0        check_sum
+984	16	h	0	check_sum
 
 # RAM initialization internal data
-1024         8       r       0        C0WL0REOST
-1032         8       r       0        C1WL0REOST
-1040         8       r       0        RCVENMT
-1048         4       r       0        C0DRT1
-1052         4       r       0        C1DRT1
+1024	8	r	0	C0WL0REOST
+1032	8	r	0	C1WL0REOST
+1040	8	r	0	RCVENMT
+1048	4	r	0	C0DRT1
+1052	4	r	0	C1DRT1
 
-1056         128     r       0        vbnv
+1056	128	r	0	vbnv
 # -----------------------------------------------------------------
 
 enumerations
 
-#ID value   text
-1     0     Disable
-1     1     Enable
-2     0     Enable
-2     1     Disable
-4     0     Fallback
-4     1     Normal
-6     0     Emergency
-6     1     Alert
-6     2     Critical
-6     3     Error
-6     4     Warning
-6     5     Notice
-6     6     Info
-6     7     Debug
-6     8     Spew
-7     0     Disable
-7     1     Enable
-7     2     Keep
-8     0     No
-8     1     Yes
-9     0     Secondary
-9     1     Primary
-11    0     1M
-11    1     4M
-11    2     8M
-11    3     16M
-11    4     32M
-11    5     48M
-11    6     64M
+#ID	value	text
+1	0	Disable
+1	1	Enable
+2	0	Enable
+2	1	Disable
+4	0	Fallback
+4	1	Normal
+6	0	Emergency
+6	1	Alert
+6	2	Critical
+6	3	Error
+6	4	Warning
+6	5	Notice
+6	6	Info
+6	7	Debug
+6	8	Spew
+7	0	Disable
+7	1	Enable
+7	2	Keep
+8	0	No
+8	1	Yes
+9	0	Secondary
+9	1	Primary
+11	0	1M
+11	1	4M
+11	2	8M
+11	3	16M
+11	4	32M
+11	5	48M
+11	6	64M
 
 # -----------------------------------------------------------------
 checksums