remove lzma loader config option (make it default) and move it from package/ to target/
[openwrt.org/openwrt.git] / target / Makefile
blob:a/target/Makefile -> blob:b/target/Makefile
--- a/target/Makefile
+++ b/target/Makefile
@@ -29,19 +29,8 @@
 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:=
@@ -83,6 +72,7 @@
 $(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

comments