From d5bb9996835dd1c410539be12cc6830cdf30fda3 Mon Sep 17 00:00:00 2001 From: ward Date: Fri, 7 Dec 2007 19:18:55 +0000 Subject: [PATCH] This patch fixes etherboot booting for the gigabyte m57sli-s4 board by disabling LZMA payload compression for the etherboot payload (they don't get along). And it renames the linuxbios Config.lb patch so that it's more clear that it is now used by both the etherboot and filo payloads. This is a trivial patch. Signed-off-by: Ward Vandewege Acked-by: Ward Vandewege git-svn-id: svn://coreboot.org/buildrom@79 0fe3215d-741a-0410-bb5a-0d2cd39d948f --- buildrom-devel/Config.in | 1 + buildrom-devel/packages/linuxbios/m57sli-linuxbios.mk | 6 +++++- ...lo-Config.lb.patch => m57sli-filo-and-etherboot-Config.lb.patch} | 0 3 files changed, 6 insertions(+), 1 deletion(-) rename buildrom-devel/packages/linuxbios/patches/{m57sli-filo-Config.lb.patch => m57sli-filo-and-etherboot-Config.lb.patch} (100%) diff --git a/buildrom-devel/Config.in b/buildrom-devel/Config.in index 4de3c54..198214b 100644 --- a/buildrom-devel/Config.in +++ b/buildrom-devel/Config.in @@ -64,6 +64,7 @@ config USE_LZMA bool "Enable LZMA compression" depends !PAYLOAD_OFW depends !PAYLOAD_FILO + depends !PAYLOAD_ETHERBOOT default y help Allow LZMA compression for the payload. This doesn't work diff --git a/buildrom-devel/packages/linuxbios/m57sli-linuxbios.mk b/buildrom-devel/packages/linuxbios/m57sli-linuxbios.mk index ac2dd03..b73bbf5 100644 --- a/buildrom-devel/packages/linuxbios/m57sli-linuxbios.mk +++ b/buildrom-devel/packages/linuxbios/m57sli-linuxbios.mk @@ -9,7 +9,11 @@ endif LINUXBIOS_PATCHES= ifeq ($(CONFIG_PAYLOAD_FILO),y) - LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/m57sli-filo-Config.lb.patch + LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/m57sli-filo-and-etherboot-Config.lb.patch +endif + +ifeq ($(CONFIG_PAYLOAD_ETHERBOOT),y) + LINUXBIOS_PATCHES += $(PACKAGE_DIR)/linuxbios/patches/m57sli-filo-and-etherboot-Config.lb.patch endif ifeq ($(CONFIG_PAYLOAD_KERNEL),y) diff --git a/buildrom-devel/packages/linuxbios/patches/m57sli-filo-Config.lb.patch b/buildrom-devel/packages/linuxbios/patches/m57sli-filo-and-etherboot-Config.lb.patch similarity index 100% rename from buildrom-devel/packages/linuxbios/patches/m57sli-filo-Config.lb.patch rename to buildrom-devel/packages/linuxbios/patches/m57sli-filo-and-etherboot-Config.lb.patch -- 2.11.4.GIT