summaryrefslogtreecommitdiff
path: root/openwrt/target/linux/image/ar7
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-08-13 12:38:47 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-08-13 12:38:47 +0000
commitb5e7f55f977311f6aa3829a90e00f5d9104b10ee (patch)
tree04694142803a9fad4c5cec5852af46ac4181cea7 /openwrt/target/linux/image/ar7
parent56829f82c5583e6c467362da7fc8150d81e37b39 (diff)
downloadmtk-20170518-b5e7f55f977311f6aa3829a90e00f5d9104b10ee.zip
mtk-20170518-b5e7f55f977311f6aa3829a90e00f5d9104b10ee.tar.gz
mtk-20170518-b5e7f55f977311f6aa3829a90e00f5d9104b10ee.tar.bz2
add updates from whiterussian to head
SVN-Revision: 1626
Diffstat (limited to 'openwrt/target/linux/image/ar7')
-rw-r--r--openwrt/target/linux/image/ar7/Makefile16
1 files changed, 9 insertions, 7 deletions
diff --git a/openwrt/target/linux/image/ar7/Makefile b/openwrt/target/linux/image/ar7/Makefile
index 1d1aea7..4436fa9 100644
--- a/openwrt/target/linux/image/ar7/Makefile
+++ b/openwrt/target/linux/image/ar7/Makefile
@@ -31,16 +31,14 @@ $(PKG_BUILD_DIR)/LzmaDecode.o: src/LzmaDecode.c
$(PKG_BUILD_DIR)/loader.o: src/loader.c
$(TARGET_CC) $(CFLAGS) -c -o $@ $<
-$(PKG_BUILD_DIR)/srec2bin: src/srec2bin.c
+$(STAGING_DIR)/bin/srec2bin: src/srec2bin.c
$(HOSTCC) -o $@ $<
-$(KDIR)/vmlinux.gz: $(KDIR)/vmlinux
- gzip -c -vf9 < $< > $@
-
$(KDIR)/vmlinux.lzma: $(KDIR)/vmlinux
cat $^ | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $@ || (rm -f $@ && false)
-$(BIN_DIR)/openwrt-ar7-2.4-kernel.bin: $(KDIR)/vmlinux.lzma compile
+ifeq ($(IB),)
+$(KDIR)/vmlinux.bin: $(KDIR)/vmlinux.lzma
$(TARGET_CROSS)ld -T $(PKG_BUILD_DIR)/zimage.script -r -b binary $< -o $(KDIR)/zimage.o
$(TARGET_CROSS)ld -static -G 0 --defsym kernel_entry=$(KERNEL_ENTRY) -T $(PKG_BUILD_DIR)/ld.script \
$(PKG_BUILD_DIR)/loader.o \
@@ -48,7 +46,11 @@ $(BIN_DIR)/openwrt-ar7-2.4-kernel.bin: $(KDIR)/vmlinux.lzma compile
$(KDIR)/zimage.o \
-o $(KDIR)/loader
$(TARGET_CROSS)objcopy -O srec $(KDIR)/loader $(KDIR)/ram_zimage.sre
- $(PKG_BUILD_DIR)/srec2bin $(KDIR)/ram_zimage.sre $@
+ $(STAGING_DIR)/bin/srec2bin $(KDIR)/ram_zimage.sre $@
+endif
+
+$(BIN_DIR)/openwrt-ar7-2.4-kernel.bin: $(KDIR)/vmlinux.bin
+ cp $< $@
ifeq ($(FS),jffs2-8MB)
ALIGN:=bs=131072 conv=sync
@@ -79,6 +81,6 @@ clean:
rm -f $(BIN_DIR)/openwrt-ar7*
prepare: $(PKG_BUILD_DIR) $(PKG_BUILD_DIR)/zimage.script $(PKG_BUILD_DIR)/ld.script
-compile: prepare $(PKG_BUILD_DIR)/loader.o $(PKG_BUILD_DIR)/LzmaDecode.o $(PKG_BUILD_DIR)/srec2bin
+compile: prepare $(PKG_BUILD_DIR)/loader.o $(PKG_BUILD_DIR)/LzmaDecode.o $(STAGING_DIR)/bin/srec2bin
install: $(BIN_DIR)/openwrt-ar7-2.4-kernel.bin $(BIN_DIR)/openwrt-ar7-$(KERNEL)-$(FS).bin