From 17046377191d14f46fd0af40be04899601a79768 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Thu, 22 May 2014 00:16:39 +1000 Subject: mainboard/asus/k8v-x: Remove dubious SIO PNP programming in romstage Remove bogus attempt to double program the Super I/O. Remove also a questionable function that enters Super I/O LDN config space, does no actual LDN programming, rather multi-function register programming and then never leaves the config space. Further, we don't export pnp_ symbols from the early_serial.c component into the global namespace. Change-Id: I7d6b97b174249ae16fe881728da5ca3dd069b696 Signed-off-by: Edward O'Callaghan Reviewed-on: http://review.coreboot.org/5800 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/mainboard/asus/k8v-x/romstage.c | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'src/mainboard/asus') diff --git a/src/mainboard/asus/k8v-x/romstage.c b/src/mainboard/asus/k8v-x/romstage.c index 4fe10163e8..275a97e9b7 100644 --- a/src/mainboard/asus/k8v-x/romstage.c +++ b/src/mainboard/asus/k8v-x/romstage.c @@ -94,21 +94,6 @@ unsigned int get_sbdn(unsigned bus) return (dev >> 15) & 0x1f; } -static void sio_init(void) -{ - u8 reg; - - pnp_enter_ext_func_mode(SERIAL_DEV); - reg = pnp_read_config(SERIAL_DEV, 0x24); - /* 4 Mbit flash */ - reg = (reg & ~0x30) | 0x20; - /* We have 24MHz input. */ - reg &= ~0x40; - /* enable MEMW#, so flash can be written */ - reg |= 0x08; - pnp_write_config(SERIAL_DEV, 0x24, reg); -} - void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) { static const uint16_t spd_addr[] = { @@ -123,7 +108,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) int needs_reset = 0; struct sys_info *sysinfo = &sysinfo_car; - sio_init(); w83697hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); console_init(); enable_rom_decode(); @@ -137,13 +121,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) enumerate_ht_chain(); } - // FIXME why is this executed again? ---> - sio_init(); - w83697hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - console_init(); - enable_rom_decode(); - // <--- FIXME why is this executed again? - print_info("now booting... real_main\n"); if (bist == 0) -- cgit v1.2.3