[LinuxBIOS] Various Config.lb fixes.
Jonathan McDowell
noodles at earth.li
Sat Aug 13 14:23:11 CEST 2005
Hi.
The attached patch fixes up the Config.lb files for the 4 targets that
buildtarget can't currently parse. These are Iwill-dk8s2,
technologic-ts5300, totalimpact-briq & newisys-khepri. None of them then
compile afterwards for me, but this at least gets them one step closer.
Is anyone working on these platforms who has a better fixup for it?
Also, Ollie, any word on the udelay stuff? Can you even give me your
quick hack to get things compiling so I can see if it's hiding any other
problems?
J.
--
] http://www.earth.li/~noodles/ [] What have I become, my sweetest [
] PGP/GPG Key @ the.earth.li [] friend? [
] via keyserver, web or email. [] [
] RSA: 4DC4E7FD / DSA: 5B430367 [] [
-------------- next part --------------
Index: src/mainboard/technologic/ts5300/Options.lb
===================================================================
--- src/mainboard/technologic/ts5300/Options.lb (revision 2008)
+++ src/mainboard/technologic/ts5300/Options.lb (working copy)
@@ -32,6 +32,9 @@
uses CC
uses HOSTCC
uses OBJCOPY
+uses DEFAULT_CONSOLE_LOGLEVEL
+uses MAXIMUM_CONSOLE_LOGLEVEL
+uses CONFIG_COMPRESS
## ROM_SIZE is the size of boot ROM that this board will use.
default ROM_SIZE = 256*1024
Index: targets/Iwill/dk8s2/Config.lb
===================================================================
--- targets/Iwill/dk8s2/Config.lb (revision 2008)
+++ targets/Iwill/dk8s2/Config.lb (working copy)
@@ -2,86 +2,18 @@
# the Iwill DK8S2
# This will make a target directory of ./dk8s2
-loadoptions
-
target dk8s2
-uses ARCH
-uses CONFIG_COMPRESS
-uses CONFIG_IOAPIC
-uses CONFIG_ROM_STREAM
-uses CONFIG_ROM_STREAM_START
-uses CONFIG_SMP
-uses CONFIG_UDELAY_TSC
-uses CPU_FIXUP
-uses FALLBACK_SIZE
-uses HAVE_FALLBACK_BOOT
-uses HAVE_MP_TABLE
-uses HAVE_PIRQ_TABLE
-uses i586
-uses i686
-uses INTEL_PPRO_MTRR
-uses HEAP_SIZE
-uses IRQ_SLOT_COUNT
-uses k7
-uses k8
-uses MAINBOARD
-uses MAINBOARD_PART_NUMBER
-uses MAINBOARD_VENDOR
-#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 CONFIG_CHIP_CONFIGURE
-
-uses CONFIG_CONSOLE_BTEXT
-uses CONFIG_CONSOLE_SERIAL8250
-uses TTYS0_BAUD
-uses DEFAULT_CONSOLE_LOGLEVEL
-uses MAXIMUM_CONSOLE_LOGLEVEL
-uses DEBUG
-uses CONFIG_MAX_CPUS
-uses CONFIG_LOGICAL_CPUS
-uses CONFIG_MAX_PHYSICAL_CPUS
-uses LINUXBIOS_EXTRA_VERSION
-uses XIP_ROM_SIZE
-uses XIP_ROM_BASE
+mainboard Iwill/DK8S2
-uses HAVE_HARD_RESET
-
-
-#
-#uses CONFIG_LSI_SCSI_FW_FIXUP
-
-
option HAVE_HARD_RESET=1
option HAVE_OPTION_TABLE=1
option HAVE_MP_TABLE=1
-option CPU_FIXUP=1
-option CONFIG_UDELAY_TSC=0
-option i686=1
-option i586=1
-option INTEL_PPRO_MTRR=1
-option k7=1
-option k8=1
option ROM_SIZE=1048576
-option CONFIG_CONSOLE_BTEXT=1
-
option HAVE_FALLBACK_BOOT=1
-# use the new chip configure code.
-
-option CONFIG_CHIP_CONFIGURE=1
#option CONFIG_LSI_SCSI_FW_FIXUP=1
@@ -98,7 +30,7 @@
###
option CONFIG_SMP=1
option CONFIG_MAX_CPUS=2
-option CONFIG_LOGICAL_CPUS=2
+#option CONFIG_LOGICAL_CPUS=2
option CONFIG_MAX_PHYSICAL_CPUS=2
#
###
@@ -142,7 +74,7 @@
###
## We do use compressed image
-option CONFIG_COMPRESS=1
+#option CONFIG_COMPRESS=1
option CONFIG_CONSOLE_SERIAL8250=1
option TTYS0_BAUD=115200
@@ -165,7 +97,7 @@
## At a maximum only compile in this level of debugging
option MAXIMUM_CONSOLE_LOGLEVEL=7
-option DEBUG=1
+#option DEBUG=1
#
@@ -210,7 +142,6 @@
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
- mainboard Iwill/DK8S2
payload /usr/src/filo-0.4.1_btext/filo.elf
# payload /usr/src/filo-0.4.2/filo.elf
end
@@ -229,8 +160,7 @@
option XIP_ROM_SIZE = 65536
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
- mainboard Iwill/DK8S2
- payload /usr/src/filo-0.4.1_btext/filo.elf
+ payload ../../../payloads/filo.elf
# payload /usr/src/filo-0.4.2/filo.elf
end
Index: targets/totalimpact/briq/Config.lb
===================================================================
--- targets/totalimpact/briq/Config.lb (revision 2008)
+++ targets/totalimpact/briq/Config.lb (working copy)
@@ -1,36 +1,10 @@
# Config file for the Total Impact briQ
# This will make a target directory of ./briq
-loadoptions
-
target briq
+
+mainboard totalimpact/briq
-uses CROSS_COMPILE
-uses HAVE_OPTION_TABLE
-uses CONFIG_COMPRESS
-uses DEFAULT_CONSOLE_LOGLEVEL
-uses CONFIG_USE_INIT
-uses NO_POST
-uses CONFIG_CONSOLE_SERIAL8250
-uses CONFIG_IDE_STREAM
-uses IDE_BOOT_DRIVE
-uses IDE_SWAB IDE_OFFSET
-uses ROM_SIZE
-uses _RESET
-uses _EXCEPTION_VECTORS
-uses _ROMBASE
-uses _ROMSTART
-uses _RAMBASE
-uses _RAMSTART
-uses STACK_SIZE
-uses HEAP_SIZE
-uses CONFIG_BRIQ_750FX
-uses CONFIG_BRIQ_7400
-
-## use a cross compiler
-#option CROSS_COMPILE="powerpc-eabi-"
-#option CROSS_COMPILE="ppc_74xx-"
-
## Use stage 1 initialization code
option CONFIG_USE_INIT=1
@@ -79,7 +53,6 @@
option CONFIG_BRIQ_750FX=1
#option CONFIG_BRIQ_7400=1
- mainboard totalimpact/briq
end
buildrom ./linuxbios.rom ROM_SIZE "normal"
Index: targets/newisys/khepri/Config.lb
===================================================================
--- targets/newisys/khepri/Config.lb (revision 2008)
+++ targets/newisys/khepri/Config.lb (working copy)
@@ -2,77 +2,20 @@
# Sample config file for Newisys Khepri systems
#
-loadoptions
-
# Target directory for khepri build
target khepri
+
+mainboard newisys/khepri
-# list of all used variables:
-uses ARCH
-uses CONFIG_COMPRESS
-uses CONFIG_IOAPIC
-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 k7
-uses k8
-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
-uses CC
-
# set target C compiler to 32bit gcc.
option CC="gcc -m32"
# Configuration options.
-option CONFIG_CHIP_CONFIGURE=1
-
option MAXIMUM_CONSOLE_LOGLEVEL=8
option DEFAULT_CONSOLE_LOGLEVEL=8
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 k7=1
-option k8=1
-
-
# Size of the image. Khepri comes with 512k per default.
option ROM_SIZE=524288
@@ -89,16 +32,14 @@
option USE_FALLBACK_IMAGE=0
option ROM_IMAGE_SIZE=0x10000
option LINUXBIOS_EXTRA_VERSION="-Khepri-Normal"
- mainboard newisys/khepri
- payload /usr/share/LinuxBIOS/tg3--ide_disk.zelf
+ payload ../../../payloads/tg3--ide_disk.zelf
end
romimage "fallback"
option USE_FALLBACK_IMAGE=1
option ROM_IMAGE_SIZE=0x10000
option LINUXBIOS_EXTRA_VERSION="-Khepri-Fallback"
- mainboard newisys/khepri
- payload /usr/share/LinuxBIOS/tg3--ide_disk.zelf
+ payload ../../../payloads/tg3--ide_disk.zelf
end
buildrom ./khepri.rom ROM_SIZE "normal" "fallback"
More information about the coreboot
mailing list