diff options
| author | Peter Stuge <peter@stuge.se> | 2007-04-12 00:28:32 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2007-04-12 00:28:32 +0000 |
| commit | 17e27509a0a5605f2ab411b65d4aff6dad229c50 (patch) | |
| tree | c1f00d3b6b00df2c3fca2296707d4a32cb888155 | |
| parent | b615c7bb3a01a1a3bfefb9f9e882c762ca4e19bd (diff) | |
Fix two boards broken by the large patches of late.
artecgroup/dbe61
Add CONFIG_COMPRESSED_PAYLOAD_NRV2B to Options.lb since it's used in
Config.lb.
Change default for CONFIG_PCI_ROM_RUN to 1 so VGA ROM can run.
technologic/ts5300
Removed CONFIG_CONSOLE_VGA, the embedded board has no VGA without the
development addon card anyways.
Changes to target Config.lb so it actually builds.
Signed-off-by: Peter Stuge <peter@stuge.se>
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2607 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | src/mainboard/artecgroup/dbe61/Options.lb | 3 | ||||
| -rw-r--r-- | src/mainboard/technologic/ts5300/Options.lb | 7 | ||||
| -rw-r--r-- | targets/technologic/ts5300/Config-abuild.lb | 2 | ||||
| -rw-r--r-- | targets/technologic/ts5300/Config.lb | 1 |
4 files changed, 2 insertions, 11 deletions
diff --git a/src/mainboard/artecgroup/dbe61/Options.lb b/src/mainboard/artecgroup/dbe61/Options.lb index 69343b1edf..382f3bdda7 100644 --- a/src/mainboard/artecgroup/dbe61/Options.lb +++ b/src/mainboard/artecgroup/dbe61/Options.lb @@ -22,6 +22,7 @@ uses ROM_SECTION_SIZE uses ROM_SECTION_OFFSET uses CONFIG_ROM_PAYLOAD_START uses CONFIG_COMPRESSED_PAYLOAD_LZMA +uses CONFIG_COMPRESSED_PAYLOAD_NRV2B uses PAYLOAD_SIZE uses _ROMBASE uses _RAMBASE @@ -51,7 +52,7 @@ default ROM_SIZE = 256*1024 ### Build options ### default CONFIG_CONSOLE_VGA=1 -default CONFIG_PCI_ROM_RUN=0 +default CONFIG_PCI_ROM_RUN=1 default CONFIG_VIDEO_MB=8 ## diff --git a/src/mainboard/technologic/ts5300/Options.lb b/src/mainboard/technologic/ts5300/Options.lb index bb5894947e..fceeb992bf 100644 --- a/src/mainboard/technologic/ts5300/Options.lb +++ b/src/mainboard/technologic/ts5300/Options.lb @@ -46,13 +46,6 @@ uses CONFIG_CONSOLE_SERIAL8250 uses DEFAULT_CONSOLE_LOGLEVEL uses MAXIMUM_CONSOLE_LOGLEVEL -# VGA support -uses CONFIG_CONSOLE_VGA -#uses CONFIG_LEGACY_VGABIOS -#uses VGABIOS_START -#uses CONFIG_PCI_ROM_RUN - - default CONFIG_CONSOLE_SERIAL8250=1 ## Select the serial console baud rate default TTYS0_BAUD=115200 diff --git a/targets/technologic/ts5300/Config-abuild.lb b/targets/technologic/ts5300/Config-abuild.lb index 2775ee5743..2d9d389062 100644 --- a/targets/technologic/ts5300/Config-abuild.lb +++ b/targets/technologic/ts5300/Config-abuild.lb @@ -7,8 +7,6 @@ option CONFIG_COMPRESS=0 __COMPRESSION__ -option CONFIG_CONSOLE_VGA=1 - romimage "fallback" option FALLBACK_SIZE = 256 * 1024 # option ROM_SIZE=512*1024 diff --git a/targets/technologic/ts5300/Config.lb b/targets/technologic/ts5300/Config.lb index 5f432cdd22..a89b4f807c 100644 --- a/targets/technologic/ts5300/Config.lb +++ b/targets/technologic/ts5300/Config.lb @@ -7,7 +7,6 @@ mainboard technologic/ts5300 option DEFAULT_CONSOLE_LOGLEVEL=3 option MAXIMUM_CONSOLE_LOGLEVEL=3 option CONFIG_COMPRESS=1 -option CONFIG_CONSOLE_VGA=0 #romimage "normal" # option USE_FALLBACK_IMAGE=0 |