[OpenWrt-Devel] [PATCH 2/5] brcm63xx: Add DT support for A226G/M

[Álvaro Fernández Rojas]

Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
---
diff --git a/target/linux/brcm63xx/dts/dwv-s0.dts b/target/linux/brcm63xx/dts/dwv-s0.dts
new file mode 100644
index 0000000..002d59b
--- /dev/null
+++ b/target/linux/brcm63xx/dts/dwv-s0.dts
@@ -0,0 +1,30 @@
+/dts-v1/;
+
+/include/ "bcm6358.dtsi"
+
+/ {
+	model = "Pirelli A226G/M";
+	compatible = "pirelli,dwv-s0", "brcm,bcm6358";
+};
+
+&pflash {
+	status = "ok";
+
+	linux,part-probe = "bcm63xxpart";
+
+	cfe at 0 {
+		label = "CFE";
+		reg = <0x000000 0x020000>;
+		read-only;
+	};
+
+	linux at 20000 {
+		label = "linux";
+		reg = <0x020000 0xfc0000>;
+	};
+
+	nvram at fe0000 {
+		label = "nvram";
+		reg = <0xfe0000 0x020000>;
+	};
+};
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index c67e9be..fccdf68 100755
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -71,16 +71,6 @@ define Image/Build/ZYXCFEDTB
 	rm -f $(BIN_DIR)/openwrt-$(5)-$(1).tmp
 endef
 
-define Image/Build/CFEAGPF
-	# Generate the tagged image
-	$(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
-		--output $(BIN_DIR)/openwrt-$(5)-$(1)-cfe.bin \
-		--boardid $(2) --chipid $(3) --entry $(LOADADDR) \
-		--load-addr $(LOADADDR) --tag-version 8 \
-		--signature2 IMAGE --block-size 0x20000 \
-		--image-offset $(4) --info1 "-$(call Image/LimitName16,$(5))" --info2 $(1)
-endef
-
 define Image/Build/RG100A
 	# Generate the tagged image
 	$(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
@@ -288,13 +278,6 @@ define Image/Build
 	$(call Image/Build/CFE,$(1),F at ST2704V2,6328,F at ST2704V2,OpenWRT-$(REVISION))
 	# Inventel Livebox
 	$(call Image/Build/RedBoot,livebox)
-	# Pirelli A226G
-	$(call Image/Build/CFEAGPF,$(1),DWV-S0,6358,0x10000,A226G-cfe)
-	$(call Image/Build/CFEAGPF,$(1),DWV-S0,6358,0x10000,A226G)
-
-	# Pirelli A226M
-	$(call Image/Build/CFEAGPF,$(1),DWV-S0,6358,0x20000,A226M-cfe)
-	$(call Image/Build/CFEAGPF,$(1),DWV-S0,6358,0x20000,A226M)
 
 	# RG100A,DB120 etc.
 	$(call Image/Build/RG100A,$(1),96358VW2,6358,0x20000,RG100A_DB120)
@@ -387,6 +370,9 @@ $(eval $(call CfeImageDTB,HG556a_AB,hg556a-b,HW556,6358,HG556a_B,EchoLife_HG556a
 $(eval $(call CfeImageDTB,HG556a_C,hg556a-c,HW556,6358,HG556a_C,EchoLife_HG556a,--image-offset 0x20000 --block-size 0x20000 --tag-version 8))
 # Pirelli AGPF-S0
 $(eval $(call CfeImageDTB,AGPF_S0,agpf-s0,AGPF-S0,6358,AGV2+W,,--block-size 0x20000 --image-offset 0x20000 --signature2 IMAGE --tag-version 8))
+# Pirelli A226G/M
+$(eval $(call CfeImageDTB,A226G,dwv-s0,DWV-S0,6358,A226G,,--block-size 0x20000 --image-offset 0x10000 --signature2 IMAGE --tag-version 8))
+$(eval $(call CfeImageDTB,A226M,dwv-s0,DWV-S0,6358,A226M,,--block-size 0x20000 --image-offset 0x20000 --signature2 IMAGE --tag-version 8))
 # T-Com Speedport W 500V
 $(eval $(call CfeImageDTB,SPW500V,spw500v,96348GW,6348,SPW500V))
 # Tecom GW6000
diff --git a/target/linux/brcm63xx/patches-3.14/370-bcm63xx-add-of_board_ids-for-all-supported-boards.patch b/target/linux/brcm63xx/patches-3.14/370-bcm63xx-add-of_board_ids-for-all-supported-boards.patch
index a997212..0423fe5 100644
--- a/target/linux/brcm63xx/patches-3.14/370-bcm63xx-add-of_board_ids-for-all-supported-boards.patch
+++ b/target/linux/brcm63xx/patches-3.14/370-bcm63xx-add-of_board_ids-for-all-supported-boards.patch
@@ -141,7 +141,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
  
  static struct board_info __initdata board_DWVS0 = {
  	.name				= "DWV-S0",
-+	.of_board_id			= "pirelli,a226g",
++	.of_board_id			= "pirelli,dwv-s0",
  	.expected_cpu_id		= 0x6358,
  
  	.has_enet0			= 1,
diff --git a/target/linux/brcm63xx/profiles/pirelli.mk b/target/linux/brcm63xx/profiles/pirelli.mk
index 1ae8fbc..d81ecca 100644
--- a/target/linux/brcm63xx/profiles/pirelli.mk
+++ b/target/linux/brcm63xx/profiles/pirelli.mk
@@ -5,6 +5,25 @@
 # See /LICENSE for more information.
 #
 
+define Profile/A226G
+  NAME:=Pirelli A226G
+  PACKAGES:=kmod-b43 wpad-mini\
+	kmod-usb2 kmod-usb-ohci
+endef
+define Profile/A226G/Description
+  Package set optimized for A226G.
+endef
+$(eval $(call Profile,A226G))
+
+define Profile/A226M
+  NAME:=Pirelli A226M
+  PACKAGES:=kmod-usb2 kmod-usb-ohci
+endef
+define Profile/A226M/Description
+  Package set optimized for A226M.
+endef
+$(eval $(call Profile,A226M))
+
 define Profile/AGPF_S0
   NAME:=Pirelli AGPF-S0
   PACKAGES:=kmod-b43 wpad-mini\
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel