diff options
| -rw-r--r-- | package/Config.in | 1 | ||||
| -rw-r--r-- | package/loader/Config.in | 6 | ||||
| -rw-r--r-- | rules.mk | 1 | ||||
| -rw-r--r-- | target/Makefile | 14 | ||||
| -rw-r--r-- | target/jffs2/Makefile | 4 | ||||
| -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/Makefile | 2 |
8 files changed, 9 insertions, 25 deletions
diff --git a/package/Config.in b/package/Config.in index 8b46c15f1..3f5afce1b 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 8a559300d..000000000 --- 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) - @@ -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 c8baab5f7..6a1bd954a 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 ca61febf2..01dede7d7 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 bfeca21c9..826194edd 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 69617056b..69617056b 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 8e7e8e479..8da08b390 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 |