Author: uwe Date: 2007-05-15 09:11:09 +0200 (Tue, 15 May 2007) New Revision: 2669
Modified: trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/Config.lb trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/auto.c trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/cmos.layout trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/failover.c trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/irq_tables.c trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/mainboard.c Log: Various cosmetic fixes (trivial).
Signed-off-by: Uwe Hermann uwe@hermann-uwe.de Acked-by: Uwe Hermann uwe@hermann-uwe.de
Modified: trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/Config.lb =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/Config.lb 2007-05-15 06:57:57 UTC (rev 2668) +++ trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/Config.lb 2007-05-15 07:11:09 UTC (rev 2669) @@ -126,13 +126,13 @@ #config chip.h
chip northbridge/amd/gx1 - device pci_domain 0 on + device pci_domain 0 on device pci 0.0 on end chip southbridge/amd/cs5530 - device pci 0a.0 on end # ETH0 - device pci 0b.0 off end # ETH1 - device pci 0c.0 on end # ETH2 - device pci 0f.0 on end # PCI slot + device pci 0a.0 on end # ETH0 + device pci 0b.0 off end # ETH1 + device pci 0c.0 on end # ETH2 + device pci 0f.0 on end # PCI slot device pci 12.0 on chip superio/winbond/w83977tf device pnp 2e.0 on # FDC @@ -157,8 +157,8 @@ device pnp 2e.5 on # Keyboard io 0x60 = 0x60 io 0x62 = 0x64 - irq 0x70 = 0x01 # int 1 for PS/2 keyboard - irq 0x72 = 0x0c # int 12 for PS/2 mouse + irq 0x70 = 0x01 # Int 1 for PS/2 keyboard + irq 0x72 = 0x0c # Int 12 for PS/2 mouse end device pnp 2e.6 on # IR io 0x60 = 0x2e8 @@ -179,10 +179,10 @@ end device pci 12.1 on end # SMI device pci 12.2 on end # IDE - device pci 12.3 on end # Audio - device pci 12.4 on end # VGA onboard + device pci 12.3 on end # Audio + device pci 12.4 on end # VGA onboard end - device pci 13.0 on end # USB + device pci 13.0 on end # USB end end
Modified: trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/auto.c 2007-05-15 06:57:57 UTC (rev 2668) +++ trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/auto.c 2007-05-15 07:11:09 UTC (rev 2669) @@ -38,33 +38,17 @@
static void main(unsigned long bist) { + /* Initialize the serial console. */ w83977tf_enable_serial(SERIAL_DEV, TTYS0_BASE); uart_init(); console_init();
- /* Halt if there was a built in self test failure */ + /* Halt if there was a built in self test failure. */ report_bist_failure(bist); - + + /* Initialize RAM. */ sdram_init(); - - /* Check all of memory */ -#if 0 - ram_check(0x00000000, msr.lo); -#endif -#if 0 - static const struct { - unsigned long lo, hi; - } check_addrs[] = { - /* Check 16MB of memory @ 0*/ - { 0x00000000, 0x01000000 }, -#if TOTAL_CPUS > 1 - /* Check 16MB of memory @ 2GB */ - { 0x80000000, 0x81000000 }, -#endif - }; - int i; - for(i = 0; i < sizeof(check_addrs)/sizeof(check_addrs[0]); i++) { - ram_check(check_addrs[i].lo, check_addrs[i].hi); - } -#endif + + /* Check RAM. */ + /* ram_check(0x00000000, 640 * 1024); */ }
Modified: trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/cmos.layout =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/cmos.layout 2007-05-15 06:57:57 UTC (rev 2668) +++ trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/cmos.layout 2007-05-15 07:11:09 UTC (rev 2669) @@ -71,4 +71,3 @@
checksum 392 1007 1008
-
Modified: trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/failover.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/failover.c 2007-05-15 06:57:57 UTC (rev 2668) +++ trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/failover.c 2007-05-15 07:11:09 UTC (rev 2669) @@ -19,6 +19,7 @@ */
#define ASSEMBLY 1 + #include <stdint.h> #include <device/pci_def.h> #include <device/pci_ids.h>
Modified: trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/irq_tables.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/irq_tables.c 2007-05-15 06:57:57 UTC (rev 2668) +++ trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/irq_tables.c 2007-05-15 07:11:09 UTC (rev 2669) @@ -39,15 +39,19 @@ * - the additional PCI slot must share the IRQ with the internal USB */
-#define IRQ_BITMAP_LINK0 0x0200 /* bit 9 means IRQ 9 available for this cs5530 INT input*/ -#define IRQ_BITMAP_LINK1 0x0020 /* bit 5 means IRQ 5 available for this cs5530 INT input*/ -#define IRQ_BITMAP_LINK2 0x0400 /* bit 10 means IRQ10 available for this cs5530 INT input*/ -#define IRQ_BITMAP_LINK3 0x0800 /* bit 11 means IRQ11 available for this cs5530 INT input*/ +/* Bit 9 means IRQ 9 is available for this cs5530 INT input. */ +#define IRQ_BITMAP_LINK0 0x0200 +/* Bit 5 means IRQ 5 is available for this cs5530 INT input. */ +#define IRQ_BITMAP_LINK1 0x0020 +/* Bit 10 means IRQ10 is available for this cs5530 INT input. */ +#define IRQ_BITMAP_LINK2 0x0400 +/* Bit 11 means IRQ11 is available for this cs5530 INT input. */ +#define IRQ_BITMAP_LINK3 0x0800
const struct irq_routing_table intel_irq_routing_table = { .signature = PIRQ_SIGNATURE, /* u32 signature */ .version = PIRQ_VERSION, /* u16 version */ - .size = 32+16*IRQ_SLOT_COUNT, /* there can be total 4 devices on the bus */ + .size = 32+16*IRQ_SLOT_COUNT, /* There can be total 4 devices on the bus */ .rtr_bus = 0x00, /* Where the interrupt router lies (bus) */ .rtr_devfn = (0x12<<3)|0x0, /* Where the interrupt router lies (dev) */ .exclusive_irqs = 0x4C20, /* IRQs devoted exclusively to PCI usage */ @@ -88,7 +92,7 @@ * the network device is soldered... * * Configuration is ommited on purpose in the attempt of solving the - * issue with IRQ panics (this is device is actually eth1) + * issue with IRQ panics (this is device is actually eth1).
[1] = { .bus = 0x00, @@ -143,7 +147,7 @@ .slot = 0x1, /* soldered */ }, /* - * This is a free PCI slot + * This is a free PCI slot. */ [3] = { .bus = 0x00, @@ -208,4 +212,3 @@ { return copy_pirq_routing_table(addr); } -
Modified: trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/mainboard.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/mainboard.c 2007-05-15 06:57:57 UTC (rev 2668) +++ trunk/LinuxBIOSv2/src/mainboard/iei/nova4899r/mainboard.c 2007-05-15 07:11:09 UTC (rev 2669) @@ -29,4 +29,3 @@ struct chip_operations mainboard_iei_nova4899r_ops = { CHIP_NAME("IEI NOVA-4899R Mainboard") }; -