projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
target/linux/image rewrite
[openwrt.git] / target / linux / image / ar7 / Makefile
diff --git a/target/linux/image/ar7/Makefile b/target/linux/image/ar7/Makefile
index 38fce6b..4ac6d30 100644 (file)
--- a/target/linux/image/ar7/Makefile
+++ b/target/linux/image/ar7/Makefile
@@ -1,12 +1,8 @@
-include $(TOPDIR)/rules.mk
-
-KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
+include ../image.mk
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/ar7loader
 
-ifeq ($(IB),)
 LOADADDR := 0x94020000
-KERNEL_ENTRY := 0x${shell nm $(KDIR)/linux-$(KERNEL)*/vmlinux | grep kernel_entry | cut -d' ' -f1}
 OUTPUT_FORMAT := elf32-tradlittlemips
 
 CFLAGS := -D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -Os \
@@ -15,18 +11,6 @@ CFLAGS := -D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -Os \
        -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap \
        -DLOADADDR=$(LOADADDR)
 
-
-$(PKG_BUILD_DIR):
-       mkdir -p $(PKG_BUILD_DIR)
-
-$(PKG_BUILD_DIR)/zimage.script: src/zimage.script.in
-       sed -e 's/@@OUTPUT_FORMAT@@/$(OUTPUT_FORMAT)/' \
-           -e 's/@@LOADADDR@@/$(LOADADDR)/' <$< >$@
-
-$(PKG_BUILD_DIR)/ld.script: src/ld.script.in
-       sed -e 's/@@OUTPUT_FORMAT@@/$(OUTPUT_FORMAT)/' \
-           -e 's/@@LOADADDR@@/$(LOADADDR)/' <$< >$@
-
 $(PKG_BUILD_DIR)/cksum.o: $(PKG_BUILD_DIR)/cksum.c
        $(HOSTCC) -o $@ $<
 
@@ -45,24 +29,35 @@ $(PKG_BUILD_DIR)/loader.o: src/loader.c
 $(STAGING_DIR)/bin/srec2bin: src/srec2bin.c
        $(HOSTCC) -o $@ $<
 
-$(KDIR)/vmlinux.lzma: $(KDIR)/vmlinux
-       cat $^ | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $@ || (rm -f $@ && false)
 
-$(KDIR)/vmlinux.bin: $(KDIR)/vmlinux.lzma compile
-       $(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 \
+define Build/Compile
+       mkdir -p $(PKG_BUILD_DIR)
+       sed -e 's/@@OUTPUT_FORMAT@@/$(OUTPUT_FORMAT)/' \
+           -e 's/@@LOADADDR@@/$(LOADADDR)/' \
+                       < src/zimage.script.in \
+                       > $(PKG_BUILD_DIR)/zimage.script
+       sed -e 's/@@OUTPUT_FORMAT@@/$(OUTPUT_FORMAT)/' \
+           -e 's/@@LOADADDR@@/$(LOADADDR)/' \
+                       < src/ld.script.in \
+                       > $(PKG_BUILD_DIR)/ld.script
+       $(MAKE) $(PKG_BUILD_DIR)/loader.o $(PKG_BUILD_DIR)/LzmaDecode.o $(STAGING_DIR)/bin/srec2bin
+endef
+
+define Build/Clean
+       rm -rf $(PKG_BUILD_DIR)
+endef
+
+define Image/Prepare
+       cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
+       $(TARGET_CROSS)ld -T $(PKG_BUILD_DIR)/zimage.script -r -b binary $(KDIR)/vmlinux.lzma -o $(KDIR)/zimage.o
+       $(TARGET_CROSS)ld -static -G 0 --defsym kernel_entry=0x$${shell nm $(KDIR)/linux-*/vmlinux | grep kernel_entry | cut -d' ' -f1} -T $(PKG_BUILD_DIR)/ld.script \
                $(PKG_BUILD_DIR)/loader.o \
                $(PKG_BUILD_DIR)/LzmaDecode.o \
                $(KDIR)/zimage.o \
                -o $(KDIR)/loader
        $(TARGET_CROSS)objcopy -O srec $(KDIR)/loader $(KDIR)/ram_zimage.sre
-       $(STAGING_DIR)/bin/srec2bin $(KDIR)/ram_zimage.sre $@
-       
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin: $(KDIR)/vmlinux.bin 
-endif
-
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin:
-       $(CP) $(KDIR)/vmlinux.bin $@
+       $(STAGING_DIR)/bin/srec2bin $(KDIR)/ram_zimage.sre $(KDIR)/vmlinux.bin
+endef
 
 ifeq ($(FS),jffs2-8MB)
 ALIGN:=bs=131072 conv=sync
@@ -71,42 +66,29 @@ ifeq ($(FS),jffs2-4MB)
 ALIGN:=bs=65536 conv=sync
 endif
 
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin
-       dd if=$< $(ALIGN) > $@
-       cat $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/root.$(FS) >> $@
-
-define pattern_template
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS)-$(1).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).bin
-       (dd if=/dev/zero bs=16 count=1; cat $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).bin) | \
-               $(STAGING_DIR)/bin/addpattern -p $(1) $(2) -o $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS)-$(1).bin
-
-install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS)-$(1).bin
+define Image/Build/CyberTAN
+       (dd if=/dev/zero bs=16 count=1; cat $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin) | \
+               $(STAGING_DIR)/bin/addpattern -p $(3) -o $(BIN_DIR)/openwrt-$(2)-$(KERNEL)-$(4).bin
 endef
 
-$(eval $(call pattern_template,AG1B))
-$(eval $(call pattern_template,WA22))
-$(eval $(call pattern_template,WAG2))
-$(eval $(call pattern_template,WA21))
-$(eval $(call pattern_template,WA31,-b))
-$(eval $(call pattern_template,WA32,-b))
+define Image/Build/sErCoMm
+       cat sercomm/adam2.bin "$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin" > "$(BIN_DIR)/openwrt-$(2)-$(KERNEL)-$(3).img"
+       dd if=sercomm/$(2) of="$(KDIR)/dgfw.tmp" bs=$$$$((0x3e0000 - 80)) seek=1 conv=notrunc
+       $(STAGING_DIR)/bin/dgfirmware -f -w "$(BIN_DIR)/openwrt-$(2)-$(KERNEL)-$(3).img" "$(KDIR)/dgfw.tmp"
+       rm -f "$(KDIR)/dgfw.tmp"
+endef
 
-ifeq ($(IB),)
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(BIN_DIR)/openwrt-$(BOARD)*
-
-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 $(STAGING_DIR)/bin/srec2bin
-else
-clean:
-prepare:
-compile:
-endif
+define Image/Build
+       dd if=$(KDIR)/vmlinux.bin $(ALIGN) > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin
+       cat $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/root.$(1) >> $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin
+       $(call Image/Build/CyberTAN,$(1),AG1B,AG1B,$(1))
+       $(call Image/Build/CyberTAN,$(1),WA21,WA21,$(1))
+       $(call Image/Build/CyberTAN,$(1),WA22,WA22,$(1))
+       $(call Image/Build/CyberTAN,$(1),WAG2,WAG2,$(1))
+       $(call Image/Build/CyberTAN,$(1),WA31,WA31 -b,$(1))
+       $(call Image/Build/CyberTAN,$(1),WA32,WA32 -b,$(1))
+       $(call Image/Build/sErCoMm,$(1),dg834,$(1))
+       $(call Image/Build/sErCoMm,$(1),jdr454wb,$(1))
+endef
 
-install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).bin
-install-ib:
-       mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
-       $(CP) $(KDIR)/vmlinux.bin $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/
-       mkdir -p $(IB_DIR)/staging_dir_$(ARCH)
-       $(CP) $(STAGING_DIR)/bin/addpattern $(IB_DIR)/staging_dir_$(ARCH)/bin/
-       
+$(eval $(call BuildImage))
Personal OpenWRT clone
This page took 0.022897 seconds and 4 git commands to generate.