From 79057c72551647fdb5ebaac28eccd6b21e28ddca Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Mon, 11 Aug 2014 11:36:59 +0000
Subject: [PATCH] brcm63xx: add helpers for building cfe images with dtb

Add a helper for building images with dtb appended kernels.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 42122
---
 target/linux/brcm63xx/image/Makefile | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 705515c88b16..eb53c8c3c2d2 100755
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -33,6 +33,8 @@ endef
 
 TARGET_DTBS:=
 
+TARGET_IMAGES:=
+
 define Image/Build/CFE
 	# Generate the tagged image
 	$(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
@@ -43,6 +45,16 @@ define Image/Build/CFE
 		$(6) $(7) $(8) $(9)
 endef
 
+define Image/Build/CFEDTB
+	# Generate the tagged image
+	$(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux-$(2).lzma.cfe -f $(KDIR)/root.$(1) \
+		--output $(BIN_DIR)/openwrt-$(5)-$(1)-cfe.bin \
+		--boardid $(3) --chipid $(4) --entry $(KERNEL_ENTRY) \
+		--load-addr $(LOADADDR) --rsa-signature "$(6)" \
+		--info1 "-$(call Image/LimitName16,$(5))" --info2 $(1) \
+		$(7) $(8) $(9) $(10)
+endef
+
 define Image/Build/CFEFIXUP
 	# Generate the tagged image
 	$(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
@@ -208,6 +220,15 @@ define Image/Build/Initramfs
 	$(call Image/Build/HCS,initramfs,cvg834g,a020,0001,0022,$(KDIR)/vmlinux-initramfs)
 endef
 
+define CfeImageDTB
+  define Image/Build/$(4)
+	$$(call Image/Build/CFEDTB,$$(1),$(1),$(2),$(3),$(4),$(5),$(6))
+  endef
+
+  TARGET_DTBS += $(1)
+  TARGET_IMAGES += $(4)
+endef
+
 define Image/Build
 	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
 	# Various routers
@@ -359,6 +380,9 @@ define Image/Build
 	# Netgear CVG834G
 	$(call Image/Build/HCS,$(1),cvg834g,a020,0001,0022,$(KDIR)/vmlinux)
 
+	# build dtb image list
+	$(foreach image,$(TARGET_IMAGES),$(call Image/Build/$(image),$(1)))
+
   ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
 	$(call Image/Build/Initramfs)
   endif
-- 
2.30.2