This patch unifies the use of config options in v2 to all start with CONFIG_

[coreboot.git] / targets / via / epia / Config.lb

diff --git a/targets/via/epia/Config.lb b/targets/via/epia/Config.lb
index 2b80ac4242d3cbd0a0447e3a4fe3f075c3ff5e0b..72440e153899f6e2d52da8a11cb2bcd8d407e097 100644 (file)
--- a/targets/via/epia/Config.lb
+++ b/targets/via/epia/Config.lb
@@ -1,109 +1,35 @@
-# Sample config file for Motorola Sandpoint X3 Demo Board with
-# the Arima HDAMA
-# This will make a target directory of ./hdama
+# Sample config file for EPIA
+# This will make a target directory of ./epia
 
-loadoptions
+## uncomment these three lines if you have a Nehemiah CPU to boot 1s faster
+#option CONFIG_UDELAY_IO=0
+#option CONFIG_UDELAY_TSC=1
+#option CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1
 
 target epia
-
-uses ARCH
-uses CONFIG_COMPRESS
-uses CONFIG_IOAPIC
-uses CONFIG_KEYBOARD
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
-uses CONFIG_UDELAY_TSC
-uses CPU_FIXUP
-uses FALLBACK_SIZE
-uses HAVE_FALLBACK_BOOT
-uses HAVE_MP_TABLE
-uses HAVE_PIRQ_TABLE
-uses HAVE_HARD_RESET
-uses i586
-uses i686
-uses INTEL_PPRO_MTRR
-uses HEAP_SIZE
-uses IRQ_SLOT_COUNT
-uses MAINBOARD_PART_NUMBER
-uses MAINBOARD_VENDOR
-uses CONFIG_SMP
-uses CONFIG_MAX_CPUS
-uses MEMORY_HOLE
-uses PAYLOAD_SIZE
-uses _RAMBASE
-uses _ROMBASE
-uses ROM_IMAGE_SIZE
-uses ROM_SECTION_OFFSET
-uses ROM_SECTION_SIZE
-uses ROM_SIZE
-uses STACK_SIZE
-uses USE_FALLBACK_IMAGE
-uses USE_OPTION_TABLE
-uses HAVE_OPTION_TABLE
-uses MAXIMUM_CONSOLE_LOGLEVEL
-uses  DEFAULT_CONSOLE_LOGLEVEL
-uses  CONFIG_CONSOLE_SERIAL8250
-uses MAINBOARD
-uses CONFIG_CHIP_CONFIGURE
-uses XIP_ROM_SIZE
-uses XIP_ROM_BASE
-uses LINUXBIOS_EXTRA_VERSION
-
-option CONFIG_CHIP_CONFIGURE=1
-option CONFIG_KEYBOARD=1
-
-option  MAXIMUM_CONSOLE_LOGLEVEL=10
-option  DEFAULT_CONSOLE_LOGLEVEL=10
-option  CONFIG_CONSOLE_SERIAL8250=1
-
-option CPU_FIXUP=1
-option CONFIG_UDELAY_TSC=0
-option i686=1
-option i586=1
-option INTEL_PPRO_MTRR=1
-
-option ROM_SIZE=524288
-
-
-option HAVE_OPTION_TABLE=1
-option CONFIG_ROM_STREAM=1
-option HAVE_FALLBACK_BOOT=1
-
-###
-### Compute the location and size of where this firmware image
-### (linuxBIOS plus bootloader) will live in the boot rom chip.
-###
-option FALLBACK_SIZE=131072
-
-## LinuxBIOS C code runs at this location in RAM
-option _RAMBASE=0x00004000
-
-#
-###
-### Compute the start location and size size of
-### The linuxBIOS bootloader.
-###
-
+mainboard via/epia
+option CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=9
+option CONFIG_DEFAULT_CONSOLE_LOGLEVEL=9
 #
-# Arima hdama
+# Via Epia
 romimage "normal"
-       option USE_FALLBACK_IMAGE=0
-       option ROM_IMAGE_SIZE=0x10000
-       option LINUXBIOS_EXTRA_VERSION=".0Normal"
-       mainboard via/epia
+       option CONFIG_USE_FALLBACK_IMAGE=0
+       option CONFIG_ROM_IMAGE_SIZE=0x10000
+       option COREBOOT_EXTRA_VERSION=".0Normal"
 #      payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #      payload ../../../../tg3--ide_disk.zelf  
-       payload ../../../../../lnxieepro100.ebi
+#      payload ../../../../../lnxieepro100.ebi
+       payload /etc/hosts
 end
 
 romimage "fallback" 
-       option USE_FALLBACK_IMAGE=1
-       option ROM_IMAGE_SIZE=0x10000
-       option LINUXBIOS_EXTRA_VERSION=".0Fallback"
-       mainboard via/epia
+       option CONFIG_USE_FALLBACK_IMAGE=1
+       option CONFIG_ROM_IMAGE_SIZE=0x10000
+       option COREBOOT_EXTRA_VERSION=".0Fallback"
 #      payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #      payload ../../../../tg3--ide_disk.zelf  
-       payload ../../../../../lnxieepro100.ebi
+#      payload ../../../../../lnxieepro100.ebi
+       payload /etc/hosts
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom CONFIG_ROM_SIZE "normal" "fallback"