Author: hawke
Date: 2008-10-16 19:45:25 +0200 (Thu, 16 Oct 2008)
New Revision: 3661
Added:
trunk/coreboot-v2/src/mainboard/bcom/winnetp680/
trunk/coreboot-v2/targets/bcom/winnetp680/
Modified:
trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Config.lb
trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Options.lb
trunk/coreboot-v2/src/mainboard/bcom/winnetp680/auto.c
trunk/coreboot-v2/src/mainboard/bcom/winnetp680/chip.h
trunk/coreboot-v2/src/mainboard/bcom/winnetp680/mainboard.c
trunk/coreboot-v2/src/superio/winbond/w83697hf/w83697hf_early_serial.c
trunk/coreboot-v2/targets/bcom/winnetp680/Config.lb
Log:
* Add a new board, the BCom WinNET P680
* Add a function to change the 24/48Mhz clock input selector on the Winbond
W83697 superio to 48Mhz, used by the WinNET P680
Signed-off-by: Alex Mauer <[EMAIL PROTECTED]>
Acked-by: Uwe Hermann <[EMAIL PROTECTED]>
Modified: trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/jetway/j7f24/Config.lb 2008-10-16
15:05:18 UTC (rev 3660)
+++ trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Config.lb 2008-10-16
17:45:25 UTC (rev 3661)
@@ -99,16 +99,14 @@
register "ide1_80pin_cable" = "0"
register "fn_ctrl_lo" = "0x80"
register "fn_ctrl_hi" = "0x1d"
- device pci a.0 on end # Firewire
- device pci f.0 on end # SATA
- device pci f.1 on end # IDE
- device pci 10.0 on end # OHCI
- device pci 10.1 on end # OHCI
- device pci 10.2 on end # OHCI
- device pci 10.3 on end # OHCI
+ device pci f.0 on end # IDE
+ device pci 10.0 on end # UHCI
+ device pci 10.1 on end # UHCI
+ device pci 10.2 on end # UHCI
+ device pci 10.3 on end # UHCI
device pci 10.4 on end # EHCI
device pci 11.0 on # Southbridge LPC
- chip superio/fintek/f71805f # Super I/O
+ chip superio/winbond/w83697hf # Super I/O
device pnp 2e.0 off # Floppy
io 0x60 = 0x3f0
irq 0x70 = 6
@@ -127,13 +125,17 @@
io 0x60 = 0x2f8
irq 0x70 = 3
end
+ device pnp 2e.6 off end # Consumer IR
+ device pnp 2e.7 off end # Game port, GPIO 1
+ device pnp 2e.8 off end # MIDI port, GPIO 5
+ device pnp 2e.9 off end # GPIO 2-4
+ device pnp 2e.a off end # ACPI
device pnp 2e.b on # HWM
- io 0x60 = 0xec00
+ io 0x60 = 0x290
end
end
end
device pci 11.5 on end # AC'97 audio
- # device pci 11.6 off end # AC'97 Modem
device pci 12.0 on end # Ethernet
end
end
Modified: trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/jetway/j7f24/Options.lb 2008-10-16
15:05:18 UTC (rev 3660)
+++ trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Options.lb 2008-10-16
17:45:25 UTC (rev 3661)
@@ -63,7 +63,6 @@
uses CONFIG_PCI_ROM_RUN
uses CONFIG_CONSOLE_VGA
uses CONFIG_MAX_PCI_BUSES
-uses TTYS0_BAUD
uses CONFIG_CHIP_NAME
uses CONFIG_VIDEO_MB
uses CONFIG_IOAPIC
Modified: trunk/coreboot-v2/src/mainboard/bcom/winnetp680/auto.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/jetway/j7f24/auto.c 2008-10-16 15:05:18 UTC
(rev 3660)
+++ trunk/coreboot-v2/src/mainboard/bcom/winnetp680/auto.c 2008-10-16
17:45:25 UTC (rev 3661)
@@ -38,7 +38,8 @@
#include "lib/delay.c"
#include "cpu/x86/lapic/boot_cpu.c"
#include "southbridge/via/vt8237r/vt8237r_early_smbus.c"
-#include "southbridge/via/vt8235/vt8235_early_serial.c"
+#include "superio/winbond/w83697hf/w83697hf_early_serial.c"
+#define SERIAL_DEV PNP_DEV(0x2e, W83697HF_SP1)
static void memreset_setup(void)
{
@@ -96,7 +97,9 @@
/* Enable multifunction for northbridge. */
pci_write_config8(ctrl.d0f0, 0x4f, 0x01);
- enable_vt8235_serial();
+ w83697hf_set_clksel_48(SERIAL_DEV);
+
+ w83697hf_enable_serial(SERIAL_DEV, TTYS0_BASE);
uart_init();
console_init();
Modified: trunk/coreboot-v2/src/mainboard/bcom/winnetp680/chip.h
===================================================================
--- trunk/coreboot-v2/src/mainboard/jetway/j7f24/chip.h 2008-10-16 15:05:18 UTC
(rev 3660)
+++ trunk/coreboot-v2/src/mainboard/bcom/winnetp680/chip.h 2008-10-16
17:45:25 UTC (rev 3661)
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-extern struct chip_operations mainboard_jetway_j7f24_ops;
+extern struct chip_operations mainboard_bcom_winnetp680_ops;
-struct mainboard_jetway_j7f24_config {
+struct mainboard_bcom_winnetp680_config {
int nothing;
};
Modified: trunk/coreboot-v2/src/mainboard/bcom/winnetp680/mainboard.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/jetway/j7f24/mainboard.c 2008-10-16
15:05:18 UTC (rev 3660)
+++ trunk/coreboot-v2/src/mainboard/bcom/winnetp680/mainboard.c 2008-10-16
17:45:25 UTC (rev 3661)
@@ -22,6 +22,6 @@
#include <device/device.h>
#include "chip.h"
-struct chip_operations mainboard_jetway_j7f24_ops = {
- CHIP_NAME("Jetway J7F[24]* Mainboard")
+struct chip_operations mainboard_bcom_winnetp680_ops = {
+ CHIP_NAME("BCOM WinNET P680 Mainboard")
};
Modified: trunk/coreboot-v2/src/superio/winbond/w83697hf/w83697hf_early_serial.c
===================================================================
--- trunk/coreboot-v2/src/superio/winbond/w83697hf/w83697hf_early_serial.c
2008-10-16 15:05:18 UTC (rev 3660)
+++ trunk/coreboot-v2/src/superio/winbond/w83697hf/w83697hf_early_serial.c
2008-10-16 17:45:25 UTC (rev 3661)
@@ -35,6 +35,16 @@
outb(0xaa, port);
}
+static void w83697hf_set_clksel_48(device_t dev)
+{
+ u16 port = dev >> 8;
+ pnp_enter_ext_func_mode(dev);
+ outb(0x24, port);
+ /* Set the clock input to 48Mhz */
+ outb(inb(port+1)|0x40, port+1);
+ pnp_exit_ext_func_mode(dev);
+}
+
static void w83697hf_enable_serial(device_t dev, u16 iobase)
{
pnp_enter_ext_func_mode(dev);
Modified: trunk/coreboot-v2/targets/bcom/winnetp680/Config.lb
===================================================================
--- trunk/coreboot-v2/targets/jetway/j7f24/Config.lb 2008-10-16 15:05:18 UTC
(rev 3660)
+++ trunk/coreboot-v2/targets/bcom/winnetp680/Config.lb 2008-10-16 17:45:25 UTC
(rev 3661)
@@ -19,8 +19,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-target jetway-j7f24
-mainboard jetway/j7f24
+target bcom-winnet-p680
+mainboard bcom/winnetp680
option MAXIMUM_CONSOLE_LOGLEVEL=8
option DEFAULT_CONSOLE_LOGLEVEL=8
@@ -38,7 +38,7 @@
option ROM_SIZE = (512 * 1024)
romimage "image"
- option COREBOOT_EXTRA_VERSION = "-j7f24"
+ option COREBOOT_EXTRA_VERSION = "-winnetp680"
payload ../payload.elf
end
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
