Please bear with me - another rename checkin. This qualifies as trivial, no

[coreboot.git] / src / mainboard / msi / ms6178 / Config.lb

diff --git a/src/mainboard/msi/ms6178/Config.lb b/src/mainboard/msi/ms6178/Config.lb
index 383c7b1ad4dbed0d99d135d7e6f87471ec8fad34..8576e8542a710129489ae273b93895f4849d6907 100644 (file)
--- a/src/mainboard/msi/ms6178/Config.lb
+++ b/src/mainboard/msi/ms6178/Config.lb
@@ -1,5 +1,5 @@
 ##
-## This file is part of the LinuxBIOS project.
+## This file is part of the coreboot project.
 ##
 ## Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
 ##
@@ -28,7 +28,7 @@ end
 default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
 default PAYLOAD_SIZE = (ROM_SECTION_SIZE - ROM_IMAGE_SIZE)
 default _ROMBASE = (CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE)
-default XIP_ROM_SIZE = 65536
+default XIP_ROM_SIZE = 64 * 1024
 default XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
 arch i386 end
 driver mainboard.o
@@ -78,6 +78,11 @@ dir /pc80
 config chip.h
 
 chip northbridge/intel/i82810                  # Northbridge
+  device apic_cluster 0 on                     # APIC cluster
+    chip cpu/intel/socket_PGA370               # CPU
+      device apic 0 on end                     # APIC
+    end
+  end
   device pci_domain 0 on
     device pci 0.0 on end                      # Host bridge
     device pci 1.0 off                         # Onboard video
@@ -87,47 +92,54 @@ chip northbridge/intel/i82810                       # Northbridge
       # end
     end
     chip southbridge/intel/i82801xx            # Southbridge
-      device pci 1e.0 on                       # PCI bridge
-        # chip drivers/pci/onboard
-        #   device pci 1.0 on end
-        #   register "rom_address" = "0xfff80000"
-        # end
-      end
-      device pci 1f.0 on                       # ISA bridge
-        chip superio/winbond/w83627hf
-          device pnp 2e.8 on                   # Floppy
-            # io 0x60 = 0x3f0
-            io 0x60 = 0x3f2
+      device pci 1e.0 on end                   # PCI bridge
+      device pci 1f.0 on                       # ISA/LPC bridge
+        chip superio/winbond/w83627hf          # Super I/O
+          device pnp 2e.0 on                   # Floppy
+            io 0x60 = 0x3f0
             irq 0x70 = 6
             drq 0x74 = 2
           end
-          device pnp 2e.9 on                   # Com1
-            io 0x60 = 0x3f8
-            irq 0x70 = 4
-          end
-          device pnp 2e.a on                   # Parallel port
+          device pnp 2e.1 on                   # Parallel port
             io 0x60 = 0x378
             irq 0x70 = 7
             drq 0x74 = 3
           end
-          device pnp 2e.b on                   # PS/2 keyboard/mouse
+          device pnp 2e.2 on                   # Com1
+            io 0x60 = 0x3f8
+            irq 0x70 = 4
+          end
+          device pnp 2e.3 on                   # Com2 (only header on board)
+            io 0x60 = 0x2f8
+            irq 0x70 = 3
+          end
+          device pnp 2e.5 on                   # PS/2 keyboard/mouse
             io 0x60 = 0x60
             io 0x62 = 0x64
             irq 0x70 = 1                       # Keyboard interrupt
             irq 0x72 = 12                      # Mouse interrupt
           end
-          device pnp 2e.c on end               # Game port
-          device pnp 2e.d on end               # MIDI / MPU401
+          device pnp 2e.6 on end               # Consumer IR (TODO)
+          device pnp 2e.7 on                   # Game port / MIDI / GPIO 1
+            io 0x60 = 0x201
+            io 0x62 = 0x330
+            irq 0x70 = 9
+          end
+          device pnp 2e.8 on end               # GPIO 2
+          device pnp 2e.9 on end               # GPIO 3
+          device pnp 2e.a on end               # ACPI
+          device pnp 2e.b on                   # Hardware monitor
+            io 0x60 = 0x290
+            irq 0x70 = 5
+          end
         end
       end
       device pci 1f.1 on end                   # IDE
       device pci 1f.2 on end                   # USB
       device pci 1f.3 on end                   # SMBus
       device pci 1f.5 on end                   # AC'97 audio
-      device pci 1f.6 off end                  # AC'97 modem
+      device pci 1f.6 on end                   # AC'97 modem
     end
   end
-  chip cpu/intel/socket_PGA370                 # CPU
-  end
 end