summaryrefslogtreecommitdiff
path: root/target/image/generic/lzma-loader
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-18 18:04:28 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-11-18 18:04:28 +0000
commitd55ff237aa21be0cc267fd5de6d835be0510b8e2 (patch)
tree245c59984c73a9da6e351ac192da1584086caf56 /target/image/generic/lzma-loader
parent260df66c4614cf4af0e5ae4628d5316b4cb9e1fc (diff)
add lzma kernel compression support for au1000
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5562 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/image/generic/lzma-loader')
-rw-r--r--target/image/generic/lzma-loader/Makefile6
-rw-r--r--target/image/generic/lzma-loader/src/Makefile3
2 files changed, 5 insertions, 4 deletions
diff --git a/target/image/generic/lzma-loader/Makefile b/target/image/generic/lzma-loader/Makefile
index 5bd01eefb6..e3a98afbce 100644
--- a/target/image/generic/lzma-loader/Makefile
+++ b/target/image/generic/lzma-loader/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME := loader
PKG_VERSION := 0.05
-PKG_BUILD_DIR := $(KDIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR := $(KDIR)/$(PKG_NAME)-$(PKG_VERSION)$(LOADER_TYPE)
$(PKG_BUILD_DIR)/.prepared:
mkdir $(PKG_BUILD_DIR)
@@ -30,12 +30,12 @@ $(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.l
$(PKG_BUILD_DIR)/vmlinux.lzma: $(KDIR)/vmlinux.lzma
$(CP) $< $@
-$(KDIR)/loader.elf: $(PKG_BUILD_DIR)/lzma.elf
+$(KDIR)/loader$(LOADER_TYPE).elf: $(PKG_BUILD_DIR)/lzma.elf
$(CP) $< $@
download:
prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(KDIR)/loader.elf
+compile: $(KDIR)/loader$(LOADER_TYPE).elf
install:
clean:
diff --git a/target/image/generic/lzma-loader/src/Makefile b/target/image/generic/lzma-loader/src/Makefile
index d4a100df4b..dbe9019f2b 100644
--- a/target/image/generic/lzma-loader/src/Makefile
+++ b/target/image/generic/lzma-loader/src/Makefile
@@ -44,6 +44,7 @@ kernel.o: vmlinux.lzma lzma.lds
$(LD) -r -b binary --oformat $(O_FORMAT) -o $@ $<
ifeq ($(IMAGE_COPY),1)
+LOADER_ENTRY ?= $(KERNEL_ENTRY)
lzma.o: decompress.o LzmaDecode.o kernel.o
sed -e 's,@LOADADDR@,$(LOADADDR),g' -e 's,@ENTRY@,entry,g' lzma.lds.in >lzma-stage2.lds
$(LD) -static --no-warn-mismatch -e entry -Tlzma-stage2.lds -o temp-$@ $^
@@ -52,7 +53,7 @@ lzma.o: decompress.o LzmaDecode.o kernel.o
$(LD) -no-warn-mismatch -T lzma-data.lds -r -o $@ -b binary lzma.tmp --oformat $(O_FORMAT)
lzma.elf: start.o lzma.o
- sed -e 's,@LOADADDR@,$(KERNEL_ENTRY),g' lzma-copy.lds.in >lzma-copy.lds
+ sed -e 's,@LOADADDR@,$(LOADER_ENTRY),g' lzma-copy.lds.in >lzma-copy.lds
$(LD) -s -Tlzma-copy.lds -o $@ $^
else
lzma.elf: start.o decompress.o LzmaDecode.o kernel.o