Author: myles Date: Thu Nov 4 19:33:42 2010 New Revision: 6018 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6018
Log: Add a rom_enable() function to via/vt8231 and call it from via/epia/romstage.c
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de Signed-off-by: Myles Watson mylesgw@gmail.com Acked-by: Uwe Hermann uwe@hermann-uwe.de
Added: trunk/src/southbridge/via/vt8231/vt8231_enable_rom.c Modified: trunk/src/mainboard/via/epia/romstage.c trunk/src/southbridge/via/vt8231/vt8231_lpc.c
Modified: trunk/src/mainboard/via/epia/romstage.c ============================================================================== --- trunk/src/mainboard/via/epia/romstage.c Wed Nov 3 22:46:41 2010 (r6017) +++ trunk/src/mainboard/via/epia/romstage.c Thu Nov 4 19:33:42 2010 (r6018) @@ -15,6 +15,7 @@ #include "lib/debug.c" #include "southbridge/via/vt8231/vt8231_early_smbus.c" #include "southbridge/via/vt8231/vt8231_early_serial.c" +#include "southbridge/via/vt8231/vt8231_enable_rom.c"
static inline int spd_read_byte(unsigned device, unsigned address) { @@ -86,6 +87,7 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
+ vt8231_enable_rom(); enable_mainboard_devices(); enable_smbus(); enable_shadow_ram();
Added: trunk/src/southbridge/via/vt8231/vt8231_enable_rom.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/southbridge/via/vt8231/vt8231_enable_rom.c Thu Nov 4 19:33:42 2010 (r6018) @@ -0,0 +1,47 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2010 Uwe Hermann uwe@hermann-uwe.de + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <arch/io.h> +#include <arch/romcc_io.h> +#include <device/pci_ids.h> + +static void vt8231_enable_rom(void) +{ + device_t dev; + + dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_VIA, + PCI_DEVICE_ID_VIA_8231), 0); + + /* + * ROM decode control register (0x43): + * + * Bit Decode range + * ----------------- + * 7 0xFFFE0000-0xFFFEFFFF + * 6 0xFFF80000-0xFFFDFFFF + * 5 0xFFF00000-0xFFF7FFFF + * 4 0x000E0000-0x000EFFFF + * 3 0x000D8000-0x000DFFFF + * 2 0x000D0000-0x000D7FFF + * 1 0x000C8000-0x000CFFFF + * 0 0x000C0000-0x000C7FFF + */ + pci_write_config8(dev, 0x43, (1 << 7) | (1 << 6) | (1 << 5)); +}
Modified: trunk/src/southbridge/via/vt8231/vt8231_lpc.c ============================================================================== --- trunk/src/southbridge/via/vt8231/vt8231_lpc.c Wed Nov 3 22:46:41 2010 (r6017) +++ trunk/src/southbridge/via/vt8231/vt8231_lpc.c Thu Nov 4 19:33:42 2010 (r6018) @@ -61,9 +61,6 @@ enables |= 0x80; pci_write_config8(dev, 0x6C, enables);
- // Map 4MB of FLASH into the address space - pci_write_config8(dev, 0x41, 0x7f); - // Set bit 6 of 0x40, because Award does it (IO recovery time) // IMPORTANT FIX - EISA 0x4d0 decoding must be on so that PCI // interrupts can be properly marked as level triggered.