imagetag's -k argument is expected to be hexadecimal instead of decimal (#4885)

[openwrt/openwrt.git] / target / linux / brcm63xx / image / Makefile

diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 203277679c75c533c15039a1e887447fb5d30599..871409626cd88f4c1869c3beab5033d0e2e5b992 100644 (file)
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -37,6 +37,31 @@ define Image/Build/CFE
        $(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin)
 endef
 
+define Image/Build/CFEAGPF
+       # Generate the tagged image
+       $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
+               -o $(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin \
+               -b $(2) -c $(3) -e $(LOADADDR) -l $(LOADADDR) \
+               -v 8 -m IMAGE -k 0x20000 -n $(4)
+       $(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin)
+endef
+
+define Image/Build/RedBoot
+       cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(1)-vmlinux.elf
+       gzip -9 -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
+       $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.bin.l7
+       dd if=$(KDIR)/vmlinux.bin.l7 of=$(BIN_DIR)/openwrt-$(1)-vmlinux.lzma bs=65536 conv=sync
+       dd if=$(KDIR)/vmlinux.bin.gz of=$(BIN_DIR)/openwrt-$(1)-vmlinux.gz bs=65536 conv=sync
+endef
+
+define Image/Build/CFEOLD
+       $(TOPDIR)/scripts/brcmImage.pl -t -p    \
+               -b $(2) -c $(3)                 \
+               -k $(KDIR)/vmlinux.lzma.cfe     \
+               -r $(KDIR)/root.$(1)            \
+               -o $(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin
+endef
+
 define Build/Clean
        $(MAKE) -C lzma-loader clean
 endef
@@ -67,16 +92,29 @@ define Image/Prepare
        rm -f $(KDIR)/fs_mark
        touch $(KDIR)/fs_mark
        $(call prepare_generic_squashfs,$(KDIR)/fs_mark)
-
 endef
 
 define Image/Build
        $(STAGING_DIR_HOST)/bin/trx -o $(BIN_DIR)/openwrt-$(BOARD)-$(1).trx -f $(KDIR)/loader.gz -f $(KDIR)/vmlinux.lzma $(call trxalign/$(1)) -f $(KDIR)/root.$(1)
+       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) bs=128k conv=sync
        $(call Image/Build/CFE,$(1),96345GW2,6345)
+       $(call Image/Build/CFE,$(1),96348GW,6348)
        # Neufbox4
        $(call Image/Build/CFE,$(1),96358VW,6358)
        # Comtrend 536
        $(call Image/Build/CFE,$(1),96348GW-11,6348)
+       # Davolink DV201AMR
+       $(call Image/Build/CFEOLD,$(1),DV201AMR,6348)
+       # USR 9108
+       $(call Image/Build/CFE,$(1),96348GW-A,6348)
+       # DG834GT
+       $(call Image/Build/CFE,$(1),96348GW-10,6348)
+       # Sagem F@ST2404
+       $(call Image/Build/CFE,$(1),F@ST2404,6348)
+       # Inventel Livebox
+       $(call Image/Build/RedBoot,livebox)
+       # Pirelli Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0
+       $(call Image/Build/CFEAGPF,$(1),AGPF-S0,6358,0x20000)
 endef
 
 $(eval $(call BuildImage))