aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-04-02 19:06:50 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-04-02 19:06:50 +0000
commitdae7e90107f09031e05500e09a238dc7445d78bf (patch)
tree4d80baf37b57ec311461834e82db4a7053417ca9
parent786263062955ddd4591994801a833a2d10cee8b6 (diff)
downloadupstream-dae7e90107f09031e05500e09a238dc7445d78bf.tar.gz
upstream-dae7e90107f09031e05500e09a238dc7445d78bf.tar.bz2
upstream-dae7e90107f09031e05500e09a238dc7445d78bf.zip
remove lzma loader config option (make it default) and move it from package/ to target/
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@530 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/Config.in1
-rw-r--r--package/loader/Config.in6
-rw-r--r--rules.mk1
-rw-r--r--target/Makefile14
-rw-r--r--target/jffs2/Makefile4
-rw-r--r--target/lzma-loader/Makefile (renamed from package/loader/Makefile)6
-rw-r--r--target/lzma-loader/patches/toolchain.patch (renamed from package/loader/patches/toolchain.patch)0
-rw-r--r--target/squashfs-lzma/Makefile2
8 files changed, 9 insertions, 25 deletions
diff --git a/package/Config.in b/package/Config.in
index 8b46c15f1d..3f5afce1b7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -3,7 +3,6 @@
menu "OpenWrt Package Selection"
comment "The default set"
-source "package/loader/Config.in"
source "package/busybox/Config.in"
source "package/dnsmasq/Config.in"
source "package/iptables/Config.in"
diff --git a/package/loader/Config.in b/package/loader/Config.in
deleted file mode 100644
index 8a559300d9..0000000000
--- a/package/loader/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_LOADER
- bool "LZMA compressed kernel loader"
- default y
- help
- LZMA compressed kernel loader (saves much space in the flash)
-
diff --git a/rules.mk b/rules.mk
index 6e804857f1..d403260ddb 100644
--- a/rules.mk
+++ b/rules.mk
@@ -73,6 +73,7 @@ LINUX_VERSION=2.4.29
LINUX_DIR:=$(BUILD_DIR)/linux
LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
LINUX_KERNEL:=$(BUILD_DIR)/buildroot-kernel
+LINUX_IMAGE:=$(BUILD_DIR)/buildroot-kernel-image
MODULES_SUBDIR := lib/modules/$(LINUX_VERSION)
MODULES_DIR := $(BUILD_DIR)/modules/$(MODULES_SUBDIR)
diff --git a/target/Makefile b/target/Makefile
index c8baab5f7a..6a1bd954a0 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -29,20 +29,9 @@ IMAGE_TARGETS += $(BIN_DIR)/openwrt-motorola-$(1).bin
endif
endef
-# Enable loader and prepare kernel
-ifeq ($(strip $(BR2_PACKAGE_LOADER)),y)
-export LINUX_LOADER=$(BUILD_DIR)/lzmaldr
-export LINUX_IMAGE=$(BUILD_DIR)/piggy.lzma
-else
-export LINUX_IMAGE=$(BUILD_DIR)/piggy.gz
-endif
-
-$(BUILD_DIR)/piggy.lzma: $(LINUX_KERNEL)
+$(LINUX_IMAGE): $(LINUX_KERNEL)
cat $^ | $(BUILD_DIR)/lzma/lzma e -si -so -eos > $@ || (rm -f $@ && false)
-$(BUILD_DIR)/piggy.gz: $(LINUX_KERNEL)
- cat $^ | gzip -c9 $^ > $@ || (rm -f $@ && false)
-
TARGET_DIRS:=
TARGET_FS:=
IMAGE_TARGETS:=
@@ -83,6 +72,7 @@ prepare: $(patsubst %,%-prepare,$(TARGET_DIRS))
$(BIN_DIR):
mkdir -p $(BIN_DIR)
+$(INSTALL_TARGET_DIRS): lzma-loader-compile
compile: $(patsubst %,%-compile,$(TARGET_DIRS))
install: utils-install lzma-install $(LINUX_IMAGE) $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS)
clean: $(patsubst %,%-clean,$(TARGET_DIRS)) image_clean
diff --git a/target/jffs2/Makefile b/target/jffs2/Makefile
index ca61febf2e..01dede7d7a 100644
--- a/target/jffs2/Makefile
+++ b/target/jffs2/Makefile
@@ -12,13 +12,13 @@ clean: jffs2root-dirclean
$(BIN_DIR)/openwrt-generic-jffs2-4MB.trx:
$(MKFS_JFFS2) --pad --little-endian --squash -e 0x10000 \
-d $(TARGET_DIR) -o $(IMAGE)-4MB.jffs2
- PATH=$(TARGET_PATH) trx -o $@ $(LINUX_LOADER) \
+ PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \
$(LINUX_IMAGE) -a 0x10000 $(IMAGE)-4MB.jffs2
$(BIN_DIR)/openwrt-generic-jffs2-8MB.trx:
$(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \
-d $(TARGET_DIR) -o $(IMAGE)-8MB.jffs2
- PATH=$(TARGET_PATH) trx -o $@ $(LINUX_LOADER) \
+ PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \
$(LINUX_IMAGE) -a 0x20000 $(IMAGE)-8MB.jffs2
$(BIN_DIR)/openwrt-wrt54g-jffs2.bin: $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx
diff --git a/package/loader/Makefile b/target/lzma-loader/Makefile
index bfeca21c9b..826194edd1 100644
--- a/package/loader/Makefile
+++ b/target/lzma-loader/Makefile
@@ -26,14 +26,14 @@ $(PKG_BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/.patched
$(MAKE) -C $(PKG_BUILD_DIR) CC=$(TARGET_CC) \
LD=$(TARGET_CROSS)ld CROSS_COMPILE=$(TARGET_CROSS)
-$(BUILD_DIR)/lzmaldr: $(PKG_BUILD_DIR)/loader.gz
+$(BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/loader.gz
cp $< $@
source: $(DL_DIR)/$(PKG_SOURCE_FILE)
prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(BUILD_DIR)/lzmaldr
+compile: $(BUILD_DIR)/loader.gz
install:
clean:
rm -rf $(PKG_BUILD_DIR)
- rm -f $(BUILD_DIR)/lzmaldr
+ rm -f $(BUILD_DIR)/loader.gz
diff --git a/package/loader/patches/toolchain.patch b/target/lzma-loader/patches/toolchain.patch
index 69617056b3..69617056b3 100644
--- a/package/loader/patches/toolchain.patch
+++ b/target/lzma-loader/patches/toolchain.patch
diff --git a/target/squashfs-lzma/Makefile b/target/squashfs-lzma/Makefile
index 8e7e8e4792..8da08b3909 100644
--- a/target/squashfs-lzma/Makefile
+++ b/target/squashfs-lzma/Makefile
@@ -11,6 +11,6 @@ clean: squashfslzmaroot-dirclean
$(BIN_DIR)/openwrt-generic-squashfs.trx:
@mkdir -p $(TARGET_DIR)/jffs
$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le
- PATH=$(TARGET_PATH) trx -o $@ $(LINUX_LOADER) \
+ PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \
$(LINUX_IMAGE) $(IMAGE).squashfslzma