diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2005-08-13 12:38:47 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2005-08-13 12:38:47 +0000 |
| commit | a7079a0dcf10923ca11d3bfd539b44b47929c9c4 (patch) | |
| tree | 38337479ed93f1fb77f613988f56217cd7d04dd8 /target/linux/image | |
| parent | 08cbdd996d413dd299be04050867306ddabb5a80 (diff) | |
| download | upstream-a7079a0dcf10923ca11d3bfd539b44b47929c9c4.tar.gz upstream-a7079a0dcf10923ca11d3bfd539b44b47929c9c4.tar.bz2 upstream-a7079a0dcf10923ca11d3bfd539b44b47929c9c4.zip | |
add updates from whiterussian to head
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1626 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/image')
| -rw-r--r-- | target/linux/image/Makefile | 4 | ||||
| -rw-r--r-- | target/linux/image/ar7/Makefile | 16 | ||||
| -rw-r--r-- | target/linux/image/brcm/Makefile | 5 |
3 files changed, 11 insertions, 14 deletions
diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile index 6509952fac..b6a6c56914 100644 --- a/target/linux/image/Makefile +++ b/target/linux/image/Makefile @@ -1,9 +1,5 @@ include $(TOPDIR)/rules.mk -ifeq ($(BOARD),) -BOARD:=brcm -endif - KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) ifeq ($(BR2_TARGET_ROOTFS_JFFS2),y) diff --git a/target/linux/image/ar7/Makefile b/target/linux/image/ar7/Makefile index 1d1aea725b..4436fa9ba9 100644 --- a/target/linux/image/ar7/Makefile +++ b/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 diff --git a/target/linux/image/brcm/Makefile b/target/linux/image/brcm/Makefile index 3399047438..ec8f72ccac 100644 --- a/target/linux/image/brcm/Makefile +++ b/target/linux/image/brcm/Makefile @@ -29,15 +29,14 @@ FSNAME:=$(patsubst jffs2-%,jffs2,$(FS)) ifneq ($(FS),jffs2-8MB) $(BIN_DIR)/openwrt-wrt54g-$(FSNAME).bin: $(BIN_DIR)/openwrt-brcm-$(KERNEL)-$(FS).trx - $(STAGING_DIR)/bin/addpattern -2 -i $< -o $@ -g - $(SED) "1s,^W54S,W54G," $@ + $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g install: $(BIN_DIR)/openwrt-wrt54g-$(FSNAME).bin endif ifneq ($(FS),jffs2-4MB) $(BIN_DIR)/openwrt-wrt54gs-$(FSNAME).bin: $(BIN_DIR)/openwrt-brcm-$(KERNEL)-$(FS).trx - $(STAGING_DIR)/bin/addpattern -2 -i $< -o $@ -g + $(STAGING_DIR)/bin/addpattern -4 -p W54S -v v4.70.6 -i $< -o $@ -g install: $(BIN_DIR)/openwrt-wrt54gs-$(FSNAME).bin endif |