[coreboot] r181 - in buildrom-devel: . config/payloads config/platforms packages/coreboot-v2
svn at coreboot.org
svn at coreboot.org
Tue May 6 17:30:33 CEST 2008
Author: myles
Date: 2008-05-06 17:30:32 +0200 (Tue, 06 May 2008)
New Revision: 181
Modified:
buildrom-devel/Config.in
buildrom-devel/config/payloads/Config.in
buildrom-devel/config/platforms/alix1c.conf
buildrom-devel/config/platforms/asus_a8v-e_se.conf
buildrom-devel/config/platforms/db800.conf
buildrom-devel/config/platforms/dbe61.conf
buildrom-devel/config/platforms/ga-2761gxdk.conf
buildrom-devel/config/platforms/m57sli.conf
buildrom-devel/config/platforms/msm800sev.conf
buildrom-devel/config/platforms/norwich.conf
buildrom-devel/config/platforms/qemu.conf
buildrom-devel/config/platforms/serengeti_cheetah.conf
buildrom-devel/config/platforms/supermicro-h8dmr.conf
buildrom-devel/config/platforms/tyan-s2881.conf
buildrom-devel/config/platforms/tyan-s2882.conf
buildrom-devel/config/platforms/tyan-s2891.conf
buildrom-devel/config/platforms/tyan-s2892.conf
buildrom-devel/config/platforms/tyan-s2895.conf
buildrom-devel/packages/coreboot-v2/coreboot.inc
buildrom-devel/packages/coreboot-v2/generic.mk
Log:
This makes it so that checking the "USE_LZMA" option in buildrom doesn't break
builds. It moves the USE_LZMA option to the payload menu, since it only
affects the payload.
It assumes that all Config.lb files don't use compression, and all
Config-lab.lb files do. It also updates qemu.conf to use 3281 which has the
correct Config-lab.lb.
Signed-off-by: Myles Watson <mylesgw at gmail.com>
Acked-by: Jordan Crouse <jordan.crouse at amd.com>
Modified: buildrom-devel/Config.in
===================================================================
--- buildrom-devel/Config.in 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/Config.in 2008-05-06 15:30:32 UTC (rev 181)
@@ -99,19 +99,6 @@
help
Specify the ROM size here in KB.
-config USE_LZMA
- bool "Enable LZMA compression"
- depends on !(PAYLOAD_OFW && COREBOOT_V2)
- depends on !(PAYLOAD_FILO && COREBOOT_V2)
- depends on !(PAYLOAD_ETHERBOOT && COREBOOT_V2)
- default y
- help
- Precompress the payload with LZMA when using coreboot v2. This doesn't
- work for FILO, OFW, or ETHERBOOT.
-
- When using COREBOOT_V3, parse the elf and have lar compress the files.
- This works with all ELF payloads.
-
config CB_USE_BUILD
bool "Specify a coreboot build dir"
depends on ADVANCED
Modified: buildrom-devel/config/payloads/Config.in
===================================================================
--- buildrom-devel/config/payloads/Config.in 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/payloads/Config.in 2008-05-06 15:30:32 UTC (rev 181)
@@ -3,6 +3,16 @@
menu "Payload Configuration"
+config USE_LZMA
+ bool "Enable LZMA compression"
+ default y
+ help
+ Precompress the payload with LZMA when using coreboot v2. This changes
+ the Config.lb file used.
+
+ When using COREBOOT_V3, parse the elf and have lar compress the files.
+ This works with all ELF payloads.
+
choice
prompt "Desired payload"
default PAYLOAD_KERNEL
Modified: buildrom-devel/config/platforms/alix1c.conf
===================================================================
--- buildrom-devel/config/platforms/alix1c.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/alix1c.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -27,8 +27,6 @@
COREBOOT_VENDOR=pcengines
COREBOOT_BOARD=alix1c
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=alix1c
CBV2_TAG=3079
Modified: buildrom-devel/config/platforms/asus_a8v-e_se.conf
===================================================================
--- buildrom-devel/config/platforms/asus_a8v-e_se.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/asus_a8v-e_se.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -41,8 +41,6 @@
COREBOOT_VENDOR=asus
COREBOOT_BOARD=a8v-e_se
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=asus_a8v-e_se
CBV2_TAG=3241
Modified: buildrom-devel/config/platforms/db800.conf
===================================================================
--- buildrom-devel/config/platforms/db800.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/db800.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -30,8 +30,6 @@
COREBOOT_VENDOR=amd
COREBOOT_BOARD=db800
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=db800
CBV2_TAG=3090
Modified: buildrom-devel/config/platforms/dbe61.conf
===================================================================
--- buildrom-devel/config/platforms/dbe61.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/dbe61.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -29,8 +29,6 @@
COREBOOT_VENDOR=artecgroup
COREBOOT_BOARD=dbe61
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=dbe61
CBV2_TAG=3090
Modified: buildrom-devel/config/platforms/ga-2761gxdk.conf
===================================================================
--- buildrom-devel/config/platforms/ga-2761gxdk.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/ga-2761gxdk.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -34,8 +34,6 @@
COREBOOT_VENDOR=gigabyte
COREBOOT_BOARD=ga_2761gxdk
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=ga_2761gxdk
CBV2_TAG=3092
Modified: buildrom-devel/config/platforms/m57sli.conf
===================================================================
--- buildrom-devel/config/platforms/m57sli.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/m57sli.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -38,8 +38,6 @@
COREBOOT_VENDOR=gigabyte
COREBOOT_BOARD=m57sli
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=m57sli
CBV2_TAG=3118
Modified: buildrom-devel/config/platforms/msm800sev.conf
===================================================================
--- buildrom-devel/config/platforms/msm800sev.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/msm800sev.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -28,8 +28,6 @@
COREBOOT_VENDOR=digitallogic
COREBOOT_BOARD=msm800sev
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=msm800sev
CBV2_TAG=3079
Modified: buildrom-devel/config/platforms/norwich.conf
===================================================================
--- buildrom-devel/config/platforms/norwich.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/norwich.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -28,8 +28,6 @@
COREBOOT_VENDOR=amd
COREBOOT_BOARD=norwich
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=norwich
CBV2_TAG=3090
Modified: buildrom-devel/config/platforms/qemu.conf
===================================================================
--- buildrom-devel/config/platforms/qemu.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/qemu.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -24,9 +24,7 @@
ETHERBOOT_ARCH=i386
# coreboot-v2 configuration
-CBV2_TAG=3241
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
+CBV2_TAG=3281
CBV2_TDIR=qemu-x86
# coreboot v3 configuration
Modified: buildrom-devel/config/platforms/serengeti_cheetah.conf
===================================================================
--- buildrom-devel/config/platforms/serengeti_cheetah.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/serengeti_cheetah.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -43,8 +43,6 @@
# coreboot configuration
COREBOOT_VENDOR=amd
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV3_TAG=HEAD
Modified: buildrom-devel/config/platforms/supermicro-h8dmr.conf
===================================================================
--- buildrom-devel/config/platforms/supermicro-h8dmr.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/supermicro-h8dmr.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -38,8 +38,6 @@
COREBOOT_VENDOR=supermicro
COREBOOT_BOARD=h8dmr
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=h8dmr
CBV2_TAG=3278
Modified: buildrom-devel/config/platforms/tyan-s2881.conf
===================================================================
--- buildrom-devel/config/platforms/tyan-s2881.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/tyan-s2881.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -38,8 +38,6 @@
COREBOOT_VENDOR=tyan
COREBOOT_BOARD=s2881
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=s2881
CBV2_TAG=3131
Modified: buildrom-devel/config/platforms/tyan-s2882.conf
===================================================================
--- buildrom-devel/config/platforms/tyan-s2882.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/tyan-s2882.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -38,8 +38,6 @@
COREBOOT_VENDOR=tyan
COREBOOT_BOARD=s2882
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=s2882
CBV2_TAG=3114
Modified: buildrom-devel/config/platforms/tyan-s2891.conf
===================================================================
--- buildrom-devel/config/platforms/tyan-s2891.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/tyan-s2891.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -38,8 +38,6 @@
COREBOOT_VENDOR=tyan
COREBOOT_BOARD=s2891
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=s2891
CBV2_TAG=3259
Modified: buildrom-devel/config/platforms/tyan-s2892.conf
===================================================================
--- buildrom-devel/config/platforms/tyan-s2892.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/tyan-s2892.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -36,8 +36,6 @@
COREBOOT_VENDOR=tyan
COREBOOT_BOARD=s2892
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=s2892
CBV2_TAG=3259
Modified: buildrom-devel/config/platforms/tyan-s2895.conf
===================================================================
--- buildrom-devel/config/platforms/tyan-s2895.conf 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/config/platforms/tyan-s2895.conf 2008-05-06 15:30:32 UTC (rev 181)
@@ -36,8 +36,6 @@
COREBOOT_VENDOR=tyan
COREBOOT_BOARD=s2895
-CBV2_CONFIG=Config.lb
-CBV2_PAYLOAD_FILE_EXT=elf
CBV2_TDIR=s2895
CBV2_TAG=3259
Modified: buildrom-devel/packages/coreboot-v2/coreboot.inc
===================================================================
--- buildrom-devel/packages/coreboot-v2/coreboot.inc 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/packages/coreboot-v2/coreboot.inc 2008-05-06 15:30:32 UTC (rev 181)
@@ -1,5 +1,13 @@
# This is the common code included by all the targets
+ifeq ($(CONFIG_USE_LZMA),y)
+ CBV2_CONFIG=Config-lab.lb
+ CBV2_PAYLOAD_FILE_EXT=elf.lzma
+else
+ CBV2_CONFIG=Config.lb
+ CBV2_PAYLOAD_FILE_EXT=elf
+endif
+
ifeq ($(CONFIG_CB_CUSTOM_REV),y)
$(warning Using custom rev $(CONFIG_CB_REVISION))
CBV2_TAG=$(CONFIG_CB_REVISION)
Modified: buildrom-devel/packages/coreboot-v2/generic.mk
===================================================================
--- buildrom-devel/packages/coreboot-v2/generic.mk 2008-05-05 20:54:01 UTC (rev 180)
+++ buildrom-devel/packages/coreboot-v2/generic.mk 2008-05-06 15:30:32 UTC (rev 181)
@@ -1,20 +1,5 @@
# This is the Generic coreboot target
-ifeq ($(CONFIG_PAYLOAD_OFW),y)
- CBV2_CONFIG=Config-lab.lb
- CBV2_PAYLOAD_FILE_EXT=elf.lzma
-endif
-
-ifeq ($(CONFIG_PAYLOAD_KERNEL),y)
- CBV2_CONFIG=Config-lab.lb
- CBV2_PAYLOAD_FILE_EXT=elf.lzma
-endif
-
-ifeq ($(CONFIG_PAYLOAD_LAB),y)
- CBV2_CONFIG=Config-lab.lb
- CBV2_PAYLOAD_FILE_EXT=elf.lzma
-endif
-
include $(PACKAGE_DIR)/coreboot-v2/coreboot.inc
coreboot: generic-coreboot
More information about the coreboot
mailing list