mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
add updates from whiterussian to head
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1626 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user