From 7003ba4a88a847707c55d593e517eaa70fc8c63d Mon Sep 17 00:00:00 2001 From: Eric Biederman Date: Sat, 16 Oct 2004 06:20:29 +0000 Subject: - First stab at running linuxbios without the old static device tree. Things are close but not quite there yet. git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1681 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/Iwill/DK8S2/mainboard.c | 1 - src/mainboard/Iwill/DK8X/mainboard.c | 1 - src/mainboard/amd/quartet/mainboard.c | 1 - src/mainboard/amd/serenade/mainboard.c | 1 - src/mainboard/amd/solo/mainboard.c | 1 - src/mainboard/arima/hdama/Options.lb | 82 ++++++++++++++++++++++++- src/mainboard/arima/hdama/chip.h | 2 +- src/mainboard/arima/hdama/mainboard.c | 8 +-- src/mainboard/densitron/dpx114/mainboard.c | 2 - src/mainboard/digitallogic/adl855pc/mainboard.c | 2 - src/mainboard/emulation/qemu-i386/mainboard.c | 1 - src/mainboard/ibm/e325/mainboard.c | 1 - src/mainboard/newisys/khepri/mainboard.c | 1 - src/mainboard/technologic/ts5300/mainboard.c | 2 - src/mainboard/tyan/s2735/mainboard.c | 1 - src/mainboard/tyan/s2850/mainboard.c | 1 - src/mainboard/tyan/s2875/mainboard.c | 1 - src/mainboard/tyan/s2880/mainboard.c | 1 - src/mainboard/tyan/s2881/mainboard.c | 1 - src/mainboard/tyan/s2882/mainboard.c | 1 - src/mainboard/tyan/s2885/mainboard.c | 1 - src/mainboard/tyan/s4880/mainboard.c | 1 - src/mainboard/tyan/s4882/mainboard.c | 1 - src/mainboard/via/epia-m/mainboard.c | 2 - src/mainboard/via/epia/mainboard.c | 2 - 25 files changed, 83 insertions(+), 36 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/Iwill/DK8S2/mainboard.c b/src/mainboard/Iwill/DK8S2/mainboard.c index 48ea1ac88b..0f609b3f69 100644 --- a/src/mainboard/Iwill/DK8S2/mainboard.c +++ b/src/mainboard/Iwill/DK8S2/mainboard.c @@ -5,7 +5,6 @@ #include #include -#include #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/Iwill/DK8X/mainboard.c b/src/mainboard/Iwill/DK8X/mainboard.c index 82041282f6..6153ce08aa 100644 --- a/src/mainboard/Iwill/DK8X/mainboard.c +++ b/src/mainboard/Iwill/DK8X/mainboard.c @@ -5,7 +5,6 @@ #include #include -#include #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/amd/quartet/mainboard.c b/src/mainboard/amd/quartet/mainboard.c index 917a2ac792..cf5b475e95 100644 --- a/src/mainboard/amd/quartet/mainboard.c +++ b/src/mainboard/amd/quartet/mainboard.c @@ -5,7 +5,6 @@ #include #include -#include #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/amd/serenade/mainboard.c b/src/mainboard/amd/serenade/mainboard.c index 27146e79b0..cce62a28e8 100644 --- a/src/mainboard/amd/serenade/mainboard.c +++ b/src/mainboard/amd/serenade/mainboard.c @@ -5,7 +5,6 @@ #include #include -#include #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/amd/solo/mainboard.c b/src/mainboard/amd/solo/mainboard.c index 2c3ccc94eb..75e66c1d03 100644 --- a/src/mainboard/amd/solo/mainboard.c +++ b/src/mainboard/amd/solo/mainboard.c @@ -6,7 +6,6 @@ #include #include -#include #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/arima/hdama/Options.lb b/src/mainboard/arima/hdama/Options.lb index 1406a48b86..5bb0bc3485 100644 --- a/src/mainboard/arima/hdama/Options.lb +++ b/src/mainboard/arima/hdama/Options.lb @@ -34,15 +34,31 @@ uses MAINBOARD_VENDOR uses MAINBOARD uses LINUXBIOS_EXTRA_VERSION uses _RAMBASE +uses CC +uses HOSTCC +uses TTYS0_BAUD +uses TTYS0_BASE +uses TTYS0_LCS +uses DEFAULT_CONSOLE_LOGLEVEL +uses MAXIMUM_CONSOLE_LOGLEVEL +uses MAINBOARD_POWER_ON_AFTER_POWER_FAIL +uses CONFIG_CONSOLE_SERIAL8250 -## ROM_SIZE is the size of boot ROM that this board will use. -default ROM_SIZE=524288 - ### ### Build options ### +## +## ROM_SIZE is the size of boot ROM that this board will use. +## +default ROM_SIZE=524288 + +## +## FALLBACK_SIZE is the amount of the ROM the complete fallback image will use +## +default FALLBACK_SIZE=131072 + ## ## Build code for the fallback boot ## @@ -123,6 +139,10 @@ default HEAP_SIZE=0x4000 ## Only use the option table in a normal image ## default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE + +## +## LinuxBIOS C code runs at this location in RAM +## default _RAMBASE=0x00004000 ## @@ -130,5 +150,61 @@ default _RAMBASE=0x00004000 ## default CONFIG_ROM_STREAM = 1 +### +### Defaults of options that you may want to override in the target config file +### + +## +## The default compiler +## +default CC="gcc" +default HOSTCC="gcc" + +## +## The Serial Console +## + +# To Enable the Serial Console +default CONFIG_CONSOLE_SERIAL8250=1 + +## Select the serial console baud rate +default TTYS0_BAUD=115200 +#default TTYS0_BAUD=57600 +#default TTYS0_BAUD=38400 +#default TTYS0_BAUD=19200 +#default TTYS0_BAUD=9600 +#default TTYS0_BAUD=4800 +#default TTYS0_BAUD=2400 +#default TTYS0_BAUD=1200 + +# Select the serial console base port +default TTYS0_BASE=0x3f8 + +# Select the serial protocol +# This defaults to 8 data bits, 1 stop bit, and no parity +default TTYS0_LCS=0x3 + +## +### Select the linuxBIOS loglevel +## +## EMERG 1 system is unusable +## ALERT 2 action must be taken immediately +## CRIT 3 critical conditions +## ERR 4 error conditions +## WARNING 5 warning conditions +## NOTICE 6 normal but significant condition +## INFO 7 informational +## DEBUG 8 debug-level messages +## SPEW 9 Way too many details + +## Request this level of debugging output +default DEFAULT_CONSOLE_LOGLEVEL=8 +## At a maximum only compile in this level of debugging +default MAXIMUM_CONSOLE_LOGLEVEL=8 + +## +## Select power on after power fail setting +default MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON" +### End Options.lb end diff --git a/src/mainboard/arima/hdama/chip.h b/src/mainboard/arima/hdama/chip.h index ba52d6dbdb..c3792f41e9 100644 --- a/src/mainboard/arima/hdama/chip.h +++ b/src/mainboard/arima/hdama/chip.h @@ -1,4 +1,4 @@ -extern struct chip_control mainboard_arima_hdama_control; +extern struct chip_operations mainboard_arima_hdama_ops; struct mainboard_arima_hdama_config { int nothing; diff --git a/src/mainboard/arima/hdama/mainboard.c b/src/mainboard/arima/hdama/mainboard.c index 81f82b3d75..78b8715640 100644 --- a/src/mainboard/arima/hdama/mainboard.c +++ b/src/mainboard/arima/hdama/mainboard.c @@ -9,7 +9,6 @@ #include #include -#include #include "../../../northbridge/amd/amdk8/northbridge.h" #include "../../../northbridge/amd/amdk8/cpu_rev.c" #include "chip.h" @@ -312,13 +311,12 @@ static struct device_operations mainboard_operations = { .enable = 0, }; -static void enumerate(struct chip *chip) +static void enable_dev(struct chip *chip) { dev_root.ops = &mainboard_operations; - chip_enumerate(chip); } -struct chip_control mainboard_arima_hdama_control = { - .enumerate = enumerate, +struct chip_operations mainboard_arima_hdama_ops = { .name = "Arima HDAMA mainboard ", + .enable_dev = enable_dev, }; diff --git a/src/mainboard/densitron/dpx114/mainboard.c b/src/mainboard/densitron/dpx114/mainboard.c index df52081ac7..5abb8fcec2 100644 --- a/src/mainboard/densitron/dpx114/mainboard.c +++ b/src/mainboard/densitron/dpx114/mainboard.c @@ -1,4 +1,3 @@ - #include #include #include @@ -6,7 +5,6 @@ #include #include -#include #include "chip.h" static int diff --git a/src/mainboard/digitallogic/adl855pc/mainboard.c b/src/mainboard/digitallogic/adl855pc/mainboard.c index 137c49a0ff..aa7428300b 100644 --- a/src/mainboard/digitallogic/adl855pc/mainboard.c +++ b/src/mainboard/digitallogic/adl855pc/mainboard.c @@ -1,4 +1,3 @@ - #include #include #include @@ -6,7 +5,6 @@ #include #include -#include #include "chip.h" static int diff --git a/src/mainboard/emulation/qemu-i386/mainboard.c b/src/mainboard/emulation/qemu-i386/mainboard.c index 270e5df9eb..4e5c84c4bc 100644 --- a/src/mainboard/emulation/qemu-i386/mainboard.c +++ b/src/mainboard/emulation/qemu-i386/mainboard.c @@ -5,7 +5,6 @@ #include #include -#include #include "chip.h" void cpufixup(unsigned long mem) diff --git a/src/mainboard/ibm/e325/mainboard.c b/src/mainboard/ibm/e325/mainboard.c index 01969d6448..83f44ec623 100644 --- a/src/mainboard/ibm/e325/mainboard.c +++ b/src/mainboard/ibm/e325/mainboard.c @@ -5,7 +5,6 @@ #include #include -#include #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/newisys/khepri/mainboard.c b/src/mainboard/newisys/khepri/mainboard.c index 5e58ebcd18..d170f48eb3 100644 --- a/src/mainboard/newisys/khepri/mainboard.c +++ b/src/mainboard/newisys/khepri/mainboard.c @@ -5,7 +5,6 @@ #include #include -#include #include "../../../northbridge/amd/amdk8/northbridge.h" #include "chip.h" diff --git a/src/mainboard/technologic/ts5300/mainboard.c b/src/mainboard/technologic/ts5300/mainboard.c index ca05fa0861..88cf9861c4 100644 --- a/src/mainboard/technologic/ts5300/mainboard.c +++ b/src/mainboard/technologic/ts5300/mainboard.c @@ -1,4 +1,3 @@ - #include #include #include @@ -6,7 +5,6 @@ #include #include -#include #include "chip.h" static int diff --git a/src/mainboard/tyan/s2735/mainboard.c b/src/mainboard/tyan/s2735/mainboard.c index 143909f1a5..c53681d9e6 100644 --- a/src/mainboard/tyan/s2735/mainboard.c +++ b/src/mainboard/tyan/s2735/mainboard.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include diff --git a/src/mainboard/tyan/s2850/mainboard.c b/src/mainboard/tyan/s2850/mainboard.c index 6864a0333d..87cb2908e7 100644 --- a/src/mainboard/tyan/s2850/mainboard.c +++ b/src/mainboard/tyan/s2850/mainboard.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include diff --git a/src/mainboard/tyan/s2875/mainboard.c b/src/mainboard/tyan/s2875/mainboard.c index bb1eba3b9b..8a7c3d0fff 100644 --- a/src/mainboard/tyan/s2875/mainboard.c +++ b/src/mainboard/tyan/s2875/mainboard.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include diff --git a/src/mainboard/tyan/s2880/mainboard.c b/src/mainboard/tyan/s2880/mainboard.c index 17ceb5d916..d15ae19997 100644 --- a/src/mainboard/tyan/s2880/mainboard.c +++ b/src/mainboard/tyan/s2880/mainboard.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include diff --git a/src/mainboard/tyan/s2881/mainboard.c b/src/mainboard/tyan/s2881/mainboard.c index 86158b7551..231f33777c 100644 --- a/src/mainboard/tyan/s2881/mainboard.c +++ b/src/mainboard/tyan/s2881/mainboard.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include diff --git a/src/mainboard/tyan/s2882/mainboard.c b/src/mainboard/tyan/s2882/mainboard.c index 0f440856af..914d302422 100644 --- a/src/mainboard/tyan/s2882/mainboard.c +++ b/src/mainboard/tyan/s2882/mainboard.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include diff --git a/src/mainboard/tyan/s2885/mainboard.c b/src/mainboard/tyan/s2885/mainboard.c index 2c01584310..f29f486896 100644 --- a/src/mainboard/tyan/s2885/mainboard.c +++ b/src/mainboard/tyan/s2885/mainboard.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include diff --git a/src/mainboard/tyan/s4880/mainboard.c b/src/mainboard/tyan/s4880/mainboard.c index 2ed9eb9c2f..cf2b3bcf21 100644 --- a/src/mainboard/tyan/s4880/mainboard.c +++ b/src/mainboard/tyan/s4880/mainboard.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include diff --git a/src/mainboard/tyan/s4882/mainboard.c b/src/mainboard/tyan/s4882/mainboard.c index 32e1a31fd2..dcabd840e2 100644 --- a/src/mainboard/tyan/s4882/mainboard.c +++ b/src/mainboard/tyan/s4882/mainboard.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c index 9597392593..443a7cbf3d 100644 --- a/src/mainboard/via/epia-m/mainboard.c +++ b/src/mainboard/via/epia-m/mainboard.c @@ -1,4 +1,3 @@ - #include #include #include @@ -6,7 +5,6 @@ #include #include -#include #include "chip.h" void vga_enable_console(); diff --git a/src/mainboard/via/epia/mainboard.c b/src/mainboard/via/epia/mainboard.c index df52081ac7..5abb8fcec2 100644 --- a/src/mainboard/via/epia/mainboard.c +++ b/src/mainboard/via/epia/mainboard.c @@ -1,4 +1,3 @@ - #include #include #include @@ -6,7 +5,6 @@ #include #include -#include #include "chip.h" static int -- cgit v1.2.3