summaryrefslogtreecommitdiff
path: root/src/mainboard/thomson/ip1000
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-04-13 21:31:42 +0000
committerStefan Reinauer <stepan@openbios.org>2010-04-13 21:31:42 +0000
commit1abf46c74ed34eb394921d2f72817c728e3bb9ee (patch)
treeb94d67e90890839332d31487aa7ee0cae0d7f26c /src/mainboard/thomson/ip1000
parent5ae1db0a9b3904c27c9d180170be844ee39ee869 (diff)
downloadcoreboot-1abf46c74ed34eb394921d2f72817c728e3bb9ee.tar.xz
ip1000: fix seabios start, fix flash gpio detection
simplify i82830 code. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5422 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/thomson/ip1000')
-rw-r--r--src/mainboard/thomson/ip1000/mainboard.c23
1 files changed, 5 insertions, 18 deletions
diff --git a/src/mainboard/thomson/ip1000/mainboard.c b/src/mainboard/thomson/ip1000/mainboard.c
index eeac3e3fc9..e8b87baa88 100644
--- a/src/mainboard/thomson/ip1000/mainboard.c
+++ b/src/mainboard/thomson/ip1000/mainboard.c
@@ -74,27 +74,15 @@ static void parport_gpios(void)
static void flash_gpios(void)
{
- u32 flash_base = 0xfff80000;
- u8 manufacturer_id, device_id;
-
- // reset mode
- write8(flash_base, 0xff);
- udelay(10);
- // read id
- write8(flash_base, 0x90);
- udelay(10);
- manufacturer_id = read8(flash_base);
- device_id = read8(flash_base + 1);
- // reset mode
- write8(flash_base, 0xff);
- udelay(10);
+ u8 manufacturer_id = read8(0xffbc0000);
+ u8 device_id = read8(0xffbc0001);
if ((manufacturer_id == 0x20) &&
((device_id == 0x2c) || (device_id == 0x2d))) {
printk(BIOS_DEBUG, "Detected ST M50FW0%c0 flash:\n",
(device_id==0x2c)?'4':'8');
u8 fgpi = read8(0xffbc0100);
- printk(BIOS_DEBUG, " FGPI0 [%c] FGPI1 [%c] FGPI2 [%c] FGPI3 [%c] FGPI4 [%c]",
+ printk(BIOS_DEBUG, " FGPI0 [%c] FGPI1 [%c] FGPI2 [%c] FGPI3 [%c] FGPI4 [%c]\n",
(fgpi & (1 << 0)) ? 'X' : ' ',
(fgpi & (1 << 1)) ? 'X' : ' ',
(fgpi & (1 << 2)) ? 'X' : ' ',
@@ -109,7 +97,6 @@ static void flash_gpios(void)
#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
static int int15_handler(void)
{
- u8 display_id;
#define BOOT_DISPLAY_DEFAULT 0
#define BOOT_DISPLAY_CRT (1 << 0)
#define BOOT_DISPLAY_TV (1 << 1)
@@ -126,8 +113,8 @@ static int int15_handler(void)
switch (M.x86.R_AX) {
case 0x5f35: /* Boot Display */
M.x86.R_AX = 0x005f; // Success
- // M.x86.R_CL = BOOT_DISPLAY_TV;
- M.x86.R_CL = BOOT_DISPLAY_DEFAULT;
+ M.x86.R_CL = BOOT_DISPLAY_TV2;
+ //M.x86.R_CL = BOOT_DISPLAY_DEFAULT;
break;
case 0x5f36: /* Boot TV Format Hook */
printk(BIOS_DEBUG, "Boot TV Format Hook. TODO\n");