From c94d73e0e6703369831fe6d489a20d71ab2bb974 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Mon, 16 Jun 2014 17:24:14 +1000 Subject: mainboard: Clear up remaining SIO_PORT from Kconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Push back any board specific values back into romstage.c #defines and drop any remaining fragments of CONFIG_SIO_PORT in-tree. Change-Id: Ieb63fb0c2ab1a82b53bafd86686de7b21ac226c3 Signed-off-by: Edward O'Callaghan Reviewed-on: http://review.coreboot.org/6045 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki --- src/mainboard/intel/cougar_canyon2/Kconfig | 4 ---- src/mainboard/intel/cougar_canyon2/romstage.c | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/mainboard/intel/cougar_canyon2') diff --git a/src/mainboard/intel/cougar_canyon2/Kconfig b/src/mainboard/intel/cougar_canyon2/Kconfig index ad3a404a14..389a13cd47 100644 --- a/src/mainboard/intel/cougar_canyon2/Kconfig +++ b/src/mainboard/intel/cougar_canyon2/Kconfig @@ -35,10 +35,6 @@ config MAX_CPUS int default 16 -config SIO_PORT - hex - default 0x164e - config SMBIOS_SYSTEM_ENCLOSURE_TYPE hex default 0x09 # This is a mobile platform diff --git a/src/mainboard/intel/cougar_canyon2/romstage.c b/src/mainboard/intel/cougar_canyon2/romstage.c index 69389257d2..add6ddc192 100644 --- a/src/mainboard/intel/cougar_canyon2/romstage.c +++ b/src/mainboard/intel/cougar_canyon2/romstage.c @@ -44,6 +44,8 @@ #include "gpio.h" #include +#define SIO_PORT 0x164e + static inline void reset_system(void) { hard_reset(); @@ -69,7 +71,7 @@ static void pch_enable_lpc(void) /* Map a range for the runtime registers to the LPC bus. */ pci_write_config32(dev, LPC_GEN2_DEC, 0xc0181); - if (sio1007_enable_uart_at(CONFIG_SIO_PORT)) { + if (sio1007_enable_uart_at(SIO_PORT)) { pci_write_config16(dev, LPC_EN, lpc_config | COMA_LPC_EN); } @@ -77,7 +79,7 @@ static void pch_enable_lpc(void) static void setup_sio_gpios(void) { - const u16 port = CONFIG_SIO_PORT; + const u16 port = SIO_PORT; const u16 runtime_port = 0x180; /* Turn on configuration mode. */ -- cgit v1.2.3