projects / openwrt / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
brcm63xx: add support for attaching dtbs to lzma kernels
[openwrt/openwrt.git] / target / linux / brcm63xx / image / Makefile
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 69621dc5aee16ff4b4f2847b975d10daebc24a70..705515c88b1653b2d7549e70fb5fbdad8cf786ae 100755 (executable)
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -31,6 +31,8 @@ define Image/LimitName16
 $(shell expr substr "$(1)" 1 16)
 endef
 
+TARGET_DTBS:=
+
 define Image/Build/CFE
        # Generate the tagged image
        $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
@@ -111,6 +113,20 @@ define Image/Build/SPW303V
        rm -f $(BIN_DIR)/openwrt-$(4)-$(1)-cfe.bin.tmp
 endef
 
+define Image/Build/ZyXEL
+       # Generate the tagged image
+       $(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
+               --output $(BIN_DIR)/openwrt-$(5)-$(1).tmp \
+               --boardid $(2) --chipid $(4) --entry $(KERNEL_ENTRY) \
+               --load-addr $(LOADADDR) --rsa-signature "$(6)" \
+               --info1 "+$(call Image/LimitName16,$(3))" --info2 $(1) \
+               $(7) $(8) $(9) $(10)
+       # Fix up header
+       $(STAGING_DIR_HOST)/bin/zyxbcm -i $(BIN_DIR)/openwrt-$(5)-$(1).tmp \
+               -o $(BIN_DIR)/openwrt-$(5)-$(1)-cfe.bin
+       rm -f $(BIN_DIR)/openwrt-$(5)-$(1).tmp
+endef
+
 define Image/Build/CFEOLD
        $(TOPDIR)/scripts/brcmImage.pl -t -p    \
                -b $(2) -c $(3)                 \
@@ -119,51 +135,88 @@ define Image/Build/CFEOLD
                -o $(BIN_DIR)/openwrt-$(2)-$(1)-cfe.bin
 endef
 
+define Image/Build/HCS
+       $(STAGING_DIR_HOST)/bin/hcsmakeimage --magic_byte=$(3) \
+               --rev_maj=$(4) --rev_min=$(5) --input_file=$(6) \
+               --output_file=$(BIN_DIR)/openwrt-$(2)-$(1).bin
+endef
+
 define Build/Clean
        $(MAKE) -C lzma-loader clean
 endef
 
-define Image/Prepare
+define Image/PrepareLoader
        # Standard LZMA kernel
-       cat $(KDIR)/vmlinux | $(STAGING_DIR_HOST)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
+       $(STAGING_DIR_HOST)/bin/lzma e -d22 -fb64 -a1 $(KDIR)/vmlinux$(1) $(KDIR)/vmlinux$(1).lzma
+
+       # Build the LZMA loader
+       rm -rf $(KDIR)/lzma-loader
+       $(MAKE) -C lzma-loader \
+               $(LOADER_MAKEOPTS) \
+               BUILD_DIR="$(KDIR)" \
+               TARGET_DIR="$(BIN_DIR)" \
+               LOADER_DATA="$(KDIR)/vmlinux$(1).lzma" \
+               LOADER=$(IMG_PREFIX)-loader$(1).elf \
+               LZMA_TEXT_START=0x80a00000 \
+               compile loader.elf
+
+       rm -f $(KDIR)/vmlinux$(1).lzma
+endef
+
+define Image/PrepareLoaderDTB
+       # append dtb to vmlinux, then build a standard LZMA loader
+       cat $(KDIR)/vmlinux$(1) $(DTS_DIR)/$(2).dtb > $(KDIR)/vmlinux$(1)-$(2)
+       $(call Image/PrepareLoader,$(1)-$(2))
+endef
 
+define Image/PrepareCFELzmaKernel
        # CFE is a LZMA nazi! It took me hours to find out the parameters!
        # Also I think lzma has a bug cause it generates different output depending on
        # if you use stdin / stdout or not. Use files instead of stdio here, cause
        # otherwise CFE will complain and not boot the image.
-       $(STAGING_DIR_HOST)/bin/lzma e -d22 -fb64 -a1 $(KDIR)/vmlinux $(KDIR)/vmlinux.lzma.tmp
+       $(STAGING_DIR_HOST)/bin/lzma e -d22 -fb64 -a1 $(KDIR)/vmlinux$(1) $(KDIR)/vmlinux$(1).lzma.tmp
 
        # Strip out the length, CFE doesn't like this
-       dd if=$(KDIR)/vmlinux.lzma.tmp of=$(KDIR)/vmlinux.lzma.cfe bs=5 count=1
-       dd if=$(KDIR)/vmlinux.lzma.tmp of=$(KDIR)/vmlinux.lzma.cfe ibs=13 obs=5 skip=1 seek=1 conv=notrunc
-       rm -f $(KDIR)/vmlinux.lzma.tmp
+       dd if=$(KDIR)/vmlinux$(1).lzma.tmp of=$(KDIR)/vmlinux$(1).lzma.cfe bs=5 count=1
+       dd if=$(KDIR)/vmlinux$(1).lzma.tmp of=$(KDIR)/vmlinux$(1).lzma.cfe ibs=13 obs=5 skip=1 seek=1 conv=notrunc
+       rm -f $(KDIR)/vmlinux$(1).lzma.tmp
+endef
 
-       # Build the LZMA loader
-       rm -f $(KDIR)/loader.gz
-       $(MAKE) -C lzma-loader \
-               BUILD_DIR="$(KDIR)" \
-               TARGET="$(KDIR)" \
-               clean install
+define Image/PrepareCFELzmaKernelDTB
+       # compile the dts (the dtb will be later reused for the lzma loader)
+       $(LINUX_DIR)/scripts/dtc/dtc -O dtb -o $(DTS_DIR)/$(1).dtb ../dts/$(1).dts
+       cat $(KDIR)/vmlinux $(DTS_DIR)/$(1).dtb > $(KDIR)/vmlinux-$(1)
+       $(call Image/PrepareCFELzmaKernel,-$(1))
+endef
+
+define Image/Prepare
+       $(call Image/PrepareCFELzmaKernel,)
 
-       echo -ne "\\x00" >> $(KDIR)/loader.gz
+       $(foreach board,$(sort $(TARGET_DTBS)), $(call Image/PrepareCFELzmaKernelDTB,$(board)))
+
+ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+       $(call Image/PrepareLoader,-initramfs)
+       $(foreach board,$(sort $(TARGET_DTBS)), $(call Image/PrepareLoaderDTB,-initramfs,$(board)))
+ endif
        rm -f $(KDIR)/fs_mark
        touch $(KDIR)/fs_mark
        $(call prepare_generic_squashfs,$(KDIR)/fs_mark)
 endef
 
+define Image/Build/Initramfs
+       # Netgear CVG834G
+       $(call Image/Build/HCS,initramfs,cvg834g,a020,0001,0022,$(KDIR)/vmlinux-initramfs)
+endef
+
 define Image/Build
        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
        # Various routers
-  ifeq ($(CONFIG_TARGET_brcm63xx_generic),y)
        $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-4M-flash-generic,,--pad 2)
        $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-8M-flash-generic,,--pad 4)
        $(call Image/Build/CFE,$(1),96328avng,6328,96328avng-16M-flash-generic,,--pad 8)
-       $(call Image/Build/CFE,$(1),96328A-1241N,6328,96328A-1241N-generic,,--pad 8)
-       $(call Image/Build/CFE,$(1),96328A-1441N1,6328,96328A-1441N1-generic,,--pad 8)
        $(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-4M-flash-generic,,--pad 2)
        $(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-8M-flash-generic,,--pad 4)
        $(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-16M-flash-generic,,--pad 8)
-       $(call Image/Build/CFE,$(1),963281T_TEF,6328,963281T_TEF-generic,,--pad 8)
        $(call Image/Build/CFE,$(1),96345GW2,6345,96345GW2-generic)
        $(call Image/Build/CFE,$(1),96345GW2,6345,96348GW2-bc221,,--layoutver 5)
        $(call Image/Build/CFE,$(1),96345GW2,6345,92345GW2-rev,OpenWRT-$(REVISION))
@@ -177,11 +230,15 @@ define Image/Build
        $(call Image/Build/CFE,$(1),96348A-122,6348,96348A-122-generic)
        $(call Image/Build/CFE,$(1),96358VW,6358,96358VW-generic)
        $(call Image/Build/CFE,$(1),96358VW2,6358,96358VW2-generic)
-  endif
        $(call Image/Build/CFE,$(1),96368MVNgr,6368,96368MVNgr-generic)
        $(call Image/Build/CFE,$(1),96368MVWG,6368,96368MVWG-generic)
 
-  ifeq ($(CONFIG_TARGET_brcm63xx_generic),y)
+       # ADB P.DG A4001N
+       $(call Image/Build/CFE,$(1),96328dg2x2,6328,A4001N,,--pad 4)
+       # ADB P.DG A4001N1
+       $(call Image/Build/CFE,$(1),963281T_TEF,6328,A4001N1,,--pad 8)
+       # Asmax AR 1004g
+       $(call Image/Build/CFEFIXUP,$(1),96348GW-10,AR1004G,6348,AR1004G)
        # BT Voyager V210_BTR
        $(call Image/Build/CFE,$(1),V210_BB,6348,BTV210_BTR,,--layoutver 5)
        # BT Voyager V210_ROI, V210_WB
@@ -206,16 +263,29 @@ define Image/Build
        $(call Image/Build/CFEFIXUP,$(1),96348GW,GW6200,6348,GW6200,$(shell printf '\x99'))
        # Neufbox4
        $(call Image/Build/CFE,$(1),96358VW,6358,NEUFBOX4,OpenWRT-$(REVISION))
-  endif
+       # Zyxel P870HW-51a v2
+       $(call Image/Build/ZyXEL,$(1),96368VVW,P870HW-51a_v2,6368,P870HW-51a_v2,ZyXEL,--signature "ZyXEL_0001")
 
        # Neufbox6
        $(call Image/Build/CFE,$(1),NB6-SER-r0,6362,NEUFBOX6,OpenWRT-$(REVISION))
 
-  ifeq ($(CONFIG_TARGET_brcm63xx_generic),y)
+       # Sagem F@ST2504n
+       $(call Image/Build/CFE,$(1),F@ST2504n,6362,F@ST2504n,OpenWRT-$(REVISION))
+
        # Comtrend 6373
        $(call Image/Build/CFE,$(1),CT6373-1,6358,CT6373)
        # Comtrend 536, 5621
        $(call Image/Build/CFEFIXUP,$(1),96348GW-11,CT536_CT5621,6348,CT536_CT5621)
+       # Comtrend AR-5381u
+       $(call Image/Build/CFE,$(1),96328A-1241N,6328,AR-5381u,,--pad 8)
+       # Comtrend AR-5387un
+       $(call Image/Build/CFE,$(1),96328A-1441N1,6328,AR-5387un,,--pad 8)
+       # Comtrend VR-3025u
+       $(call Image/Build/CFE,$(1),96368M-1541N,6368,VR-3025u,,--pad 16)
+       # Comtrend VR-3025un
+       $(call Image/Build/CFE,$(1),96368M-1341N,6368,VR-3025un,,--pad 4)
+       # Comtrend WAP-5813n
+       $(call Image/Build/CFE,$(1),96369R-1231N,6368,WAP-5813n,,--pad 4)
        # Davolink DV201AMR
        $(call Image/Build/CFEOLD,$(1),DV201AMR,6348)
        # USR 9108
@@ -249,6 +319,9 @@ define Image/Build
        # Sagem F@ST2604
        $(call Image/Build/CFE,$(1),F@ST2604,6348,F@ST2604-cfe)
        $(call Image/Build/CFE,$(1),F@ST2604,6348,F@ST2604,OpenWRT-$(REVISION))
+       # Sagem F@ST2704V2
+       $(call Image/Build/CFE,$(1),F@ST2704V2,6328,F@ST2704V2-cfe)
+       $(call Image/Build/CFE,$(1),F@ST2704V2,6328,F@ST2704V2,OpenWRT-$(REVISION))
        # Inventel Livebox
        $(call Image/Build/RedBoot,livebox)
        # Pirelli Alice Gate VoIP 2 Plus Wi-Fi AGPF-S0
@@ -271,6 +344,9 @@ define Image/Build
        # T-Com Speedport W 500V
        $(call Image/Build/CFEFIXUP,$(1),96348GW,SPW500V,6348,SPW500V)
 
+       # Huawei HW520
+       $(call Image/Build/CFE,$(1),HW6358GW_B,6358,HW520,EchoLife_HG520v)
+
        #HW553
        $(call Image/Build/CFEHW553,$(1),HW553,6358,0x20000,HW553)
 
@@ -279,6 +355,12 @@ define Image/Build
 
        # T-Com Speedport W 303V Typ B
        $(call Image/Build/SPW303V,$(1),96358-502V,6358,SPW303V)
+
+       # Netgear CVG834G
+       $(call Image/Build/HCS,$(1),cvg834g,a020,0001,0022,$(KDIR)/vmlinux)
+
+  ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+       $(call Image/Build/Initramfs)
   endif
 endef
 
OpenWrt Source Repository