From f22bab1017abddc826a1e830eece2ba8099166ee Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Mon, 11 Aug 2014 11:37:04 +0000
Subject: [PATCH] brcm63xx: move bcm96328avng to dtb detection

Use appended dtb for board detection for bcm96328avng.

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

SVN-Revision: 42124
---
 target/linux/brcm63xx/dts/bcm96328avng.dts | 8 ++++++++
 target/linux/brcm63xx/image/Makefile       | 7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 target/linux/brcm63xx/dts/bcm96328avng.dts

diff --git a/target/linux/brcm63xx/dts/bcm96328avng.dts b/target/linux/brcm63xx/dts/bcm96328avng.dts
new file mode 100644
index 000000000000..52e7dafe1b5d
--- /dev/null
+++ b/target/linux/brcm63xx/dts/bcm96328avng.dts
@@ -0,0 +1,8 @@
+/dts-v1/;
+
+/include/ "bcm6328.dtsi"
+
+/ {
+	model = "Broadcom BCM96328avng reference board";
+	compatible = "brcm,bcm96328avng", "brcm,bcm6328";
+};
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index eb53c8c3c2d2..1f7f631b7a0c 100755
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -232,9 +232,6 @@ endef
 define Image/Build
 	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
 	# Various routers
-	$(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),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)
@@ -388,4 +385,8 @@ define Image/Build
   endif
 endef
 
+$(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-4M-flash-generic,,--pad 2))
+$(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-8M-flash-generic,,--pad 4))
+$(eval $(call CfeImageDTB,bcm96328avng,96328avng,6328,96328avng-16M-flash-generic,,--pad 8))
+
 $(eval $(call BuildImage))
-- 
2.30.2