Timothy Pearson (tpearson@raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10429
-gerrit
commit 1c3a5f289baa0ea8c998d0ee3698376417cfb573 Author: Timothy Pearson tpearson@raptorengineeringinc.com Date: Thu Jun 4 14:13:06 2015 -0500
mainboards/lenovo/t400: Remove X200-specific code
Change-Id: Ic3503938b996bbf31f1417923f019a7bc722b9fd Signed-off-by: Timothy Pearson tpearson@raptorengineeringinc.com --- src/mainboard/lenovo/t400/Kconfig | 9 ++++----- src/mainboard/lenovo/t400/Kconfig.name | 4 ++-- src/mainboard/lenovo/t400/devicetree.cb | 7 +------ src/mainboard/lenovo/t400/dock.h | 4 ++-- src/mainboard/lenovo/t400/mainboard.c | 1 - 5 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig index 7bae12d..e410f20 100644 --- a/src/mainboard/lenovo/t400/Kconfig +++ b/src/mainboard/lenovo/t400/Kconfig @@ -1,4 +1,4 @@ -if BOARD_LENOVO_X200 +if BOARD_LENOVO_T400
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y @@ -22,15 +22,14 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG select INTEL_INT15 select SUPERIO_NSC_PC87382 - select DRIVERS_LENOVO_WACOM
config MAINBOARD_DIR string - default lenovo/x200 + default lenovo/t400
config MAINBOARD_PART_NUMBER string - default "ThinkPad X200" + default "ThinkPad T400"
config MMCONF_BASE_ADDRESS hex @@ -48,4 +47,4 @@ config CBFS_SIZE hex default 0x200000
-endif # BOARD_LENOVO_X200 +endif # BOARD_LENOVO_T400 diff --git a/src/mainboard/lenovo/t400/Kconfig.name b/src/mainboard/lenovo/t400/Kconfig.name index 8e1dd43..56a575e 100644 --- a/src/mainboard/lenovo/t400/Kconfig.name +++ b/src/mainboard/lenovo/t400/Kconfig.name @@ -1,2 +1,2 @@ -config BOARD_LENOVO_X200 - bool "ThinkPad X200 / X200t" +config BOARD_LENOVO_T400 + bool "ThinkPad T400" diff --git a/src/mainboard/lenovo/t400/devicetree.cb b/src/mainboard/lenovo/t400/devicetree.cb index cb4a021..c3fffe8 100644 --- a/src/mainboard/lenovo/t400/devicetree.cb +++ b/src/mainboard/lenovo/t400/devicetree.cb @@ -181,12 +181,7 @@ chip northbridge/intel/gm45 end
chip superio/nsc/pc87382 - device pnp 164e.3 on # Digitizer - io 0x60 = 0x200 - irq 0x29 = 0xb0 - irq 0x70 = 0x5 - irq 0xf0 = 0x82 - end + device pnp 164e.3 off end # IR, not connected device pnp 164e.2 off end # GPIO, not connected diff --git a/src/mainboard/lenovo/t400/dock.h b/src/mainboard/lenovo/t400/dock.h index a5029e1..0b97531 100644 --- a/src/mainboard/lenovo/t400/dock.h +++ b/src/mainboard/lenovo/t400/dock.h @@ -17,8 +17,8 @@ * Foundation, Inc. */
-#ifndef THINKPAD_X200_DOCK_H -#define THINKPAD_X200_DOCK_H +#ifndef THINKPAD_T400_DOCK_H +#define THINKPAD_T400_DOCK_H
extern void dock_connect(void); extern void dock_disconnect(void); diff --git a/src/mainboard/lenovo/t400/mainboard.c b/src/mainboard/lenovo/t400/mainboard.c index 3ec615f..c8bc10b 100644 --- a/src/mainboard/lenovo/t400/mainboard.c +++ b/src/mainboard/lenovo/t400/mainboard.c @@ -34,7 +34,6 @@
static void fill_ssdt(void) { - drivers_lenovo_serial_ports_ssdt_generate("\_SB.PCI0.LPCB", 0); }
static void mainboard_enable(device_t dev)