brcm63xx: use more systematic names for image and DTS files

This changes brcm63xx target to achieve consistency between image
names, device nodes names, compatible, DTS name and device name
as much as possible. As with other targets, having consistent
names is supposed to make life easier for developers and reduces
the number of "variables" in the system. In particular, applying
the DTS scheme will make it easier to find the correct file and
architecture.

DTS files are named based on the increasingly common
soc-vendor-model scheme, using hyphens for separation as this seems
to be the kernel way. Since the compatible is not used at the
moment, I took the chance to also align them with this patch.

For the SOC, the already existing CFE_CHIP_ID can be exploiting
for all but two devices.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

target/linux/brcm63xx/dts/bcm6318-brcm-bcm96318ref-p300.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Broadcom BCM96318REF_P300 reference board";
-	compatible = "brcm,bcm96318ref_p300", "brcm,bcm6318";
+	compatible = "brcm,bcm96318ref-p300", "brcm,bcm6318";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6318-d-link-dsl-275xb-d1.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "D-Link DSL-2750B/DSL-2751 rev D1";
-	compatible = "d-link,dsl-275xb-d", "brcm,bcm6318";
+	compatible = "d-link,dsl-275xb-d1", "brcm,bcm6318";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6318-sagem-fast-2704n.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Sagem F@ST2704N";
-	compatible = "sagem,f@st2704n", "brcm,bcm6318";
+	compatible = "sagem,fast-2704n", "brcm,bcm6318";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm63268-brcm-bcm963268bu-p300.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Broadcom BCM963268BU_P300 reference board";
-	compatible = "brcm,bcm963268bu_p300", "brcm,bcm63268";
+	compatible = "brcm,bcm963268bu-p300", "brcm,bcm63268";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6328-brcm-bcm963281tan.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Broadcom bcm963281TAN reference board";
-	compatible = "brcm,bcm963281TAN", "brcm,bcm6328";
+	compatible = "brcm,bcm963281tan", "brcm,bcm6328";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6328-d-link-dsl-274xb-f1.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "D-Link DSL-2740B/DSL-2741B rev F1";
-	compatible = "d-link,dsl-274xb-f", "brcm,bcm6328";
+	compatible = "d-link,dsl-274xb-f1", "brcm,bcm6328";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6328-nucom-r5010un-v2.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "NuCom R5010UN v2";
-	compatible = "nucom,r5010unv2", "brcm,bcm6328";
+	compatible = "nucom,r5010un-v2", "brcm,bcm6328";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6328-sagem-fast-2704-v2.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Sagem F@ST2704V2";
-	compatible = "sagem,f@st2704v2", "brcm,bcm6328";
+	compatible = "sagem,fast-2704-v2", "brcm,bcm6328";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6348-asmax-ar-1004g.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "ASMAX AR 1004g";
-	compatible = "asmax,ar1004g", "brcm,bcm6348";
+	compatible = "asmax,ar-1004g", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6348-bt-voyager-2110.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "BT Voyager 2110";
-	compatible = "bt,v2110", "brcm,bcm6348";
+	compatible = "bt,voyager-2110", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6348-bt-voyager-2500v-bb.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "BT Voyager V2500V";
-	compatible = "bt,v2500v-bb", "brcm,bcm6348";
+	compatible = "bt,voyager-2500v-bb", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6348-comtrend-ct-536plus.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Comtrend CT-536+/CT-5621T";
-	compatible = "comtrend,ct-536+", "brcm,bcm6348";
+	compatible = "comtrend,ct-536plus", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6348-inventel-livebox-1.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Inventel Livebox 1";
-	compatible = "inventel,livebox-blue-5g", "brcm,bcm6348";
+	compatible = "inventel,livebox-1", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6348-netgear-dg834gt-pn.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Netgear DG834GT/PN";
-	compatible = "netgear,dg834gtpn", "brcm,bcm6348";
+	compatible = "netgear,dg834gt-pn", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6348-sagem-fast-2404.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Sagem F@ST2404";
-	compatible = "sagem,f@st2404", "brcm,bcm6348";
+	compatible = "sagem,fast-2404", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6348-sagem-fast-2604.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Sagem F@ST2604";
-	compatible = "sagem,f@st2604", "brcm,bcm6348";
+	compatible = "sagem,fast-2604", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6348-t-com-speedport-w-500v.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "T-Com Speedport W500 V";
-	compatible = "t-com,spw500v", "brcm,bcm6348";
+	compatible = "t-com,speedport-w-500v", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6348-telsey-cpva502plus.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Telsey CPVA502+";
-	compatible = "telsey,cpva502+", "brcm,bcm6348";
+	compatible = "telsey,cpva502plus", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6348-usrobotics-usr9108.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "USRobotics 9108";
-	compatible = "usr,9108", "brcm,bcm6348";
+	compatible = "usrobotics,usr9108", "brcm,bcm6348";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6358-bt-home-hub-2-a.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "BT Home Hub 2.0 Type A";
-	compatible = "thomson,homehub2a", "brcm,bcm6358";
+	compatible = "bt,home-hub-2-a", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6358-d-link-dva-g3810bn-tl.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "D-Link DVA-G3810BN/TL";
-	compatible = "d-link,dva-g3810bn/tl", "brcm,bcm6358";
+	compatible = "d-link,dva-g3810bn-tl", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg520v.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei EchoLife HG520v";
-	compatible = "huawei,hg520v", "brcm,bcm6358";
+	compatible = "huawei,echolife-hg520v", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg553.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei EchoLife HG553";
-	compatible = "huawei,hg553", "brcm,bcm6358";
+	compatible = "huawei,echolife-hg553", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-a.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei EchoLife HG556a (version A)";
-	compatible = "huawei,hg556a-a", "brcm,bcm6358";
+	compatible = "huawei,echolife-hg556a-a", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-b.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei EchoLife HG556a (version B)";
-	compatible = "huawei,hg556a-b", "brcm,bcm6358";
+	compatible = "huawei,echolife-hg556a-b", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg556a-c.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei EchoLife HG556a (version C)";
-	compatible = "huawei,hg556a-c", "brcm,bcm6358";
+	compatible = "huawei,echolife-hg556a-c", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-foxconn-r1.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "SFR Neuf Box 4 (Foxconn)";
-	compatible = "sfr,nb4-fxc-r1", "brcm,bcm6358";
+	compatible = "sfr,neufbox-4-foxconn-r1", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6358-sfr-neufbox-4-sercomm-r0.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "SFR Neuf Box 4 (Sercomm)";
-	compatible = "sfr,nb4-ser-r0", "brcm,bcm6358";
+	compatible = "sfr,neufbox-4-sercomm-r0", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6358-t-com-speedport-w-303v.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "T-Com Speedport W303 V";
-	compatible = "t-com,spw303v", "brcm,bcm6358";
+	compatible = "t-com,speedport-w-303v", "brcm,bcm6358";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6362-sagem-fast-2504n.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Sagem F@ST2504n";
-	compatible = "sagem,f@st2504n", "brcm,bcm6362";
+	compatible = "sagem,fast-2504n", "brcm,bcm6362";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "SFR neufbox 6 (Sercomm)";
-	compatible = "sfr,nb6-ser-r0", "brcm,bcm6362";
+	compatible = "sfr,neufbox-6-sercomm-r0", "brcm,bcm6362";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg622.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei HG622";
-	compatible = "huawei,hg622", "brcm,bcm6368";
+	compatible = "huawei,echolife-hg622", "brcm,bcm6368";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6368-huawei-echolife-hg655b.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Huawei HG655b";
-	compatible = "huawei,hg655b", "brcm,bcm6368";
+	compatible = "huawei,echolife-hg655b", "brcm,bcm6368";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts

@@ -6,7 +6,7 @@
 
 / {
 	model = "Netgear DGND3700v1/DGND3800B";
-	compatible = "netgear,dgnd3700v1", "brcm,bcm6368";
+	compatible = "netgear,dgnd3700-v1", "brcm,bcm6368";
 
 	chosen {
 		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";

target/linux/brcm63xx/image/Makefile

@@ -161,6 +161,8 @@ define Device/Default
   KERNEL_DEPENDS = $$(wildcard ../dts/$$(DEVICE_DTS).dts)
   KERNEL_INITRAMFS_SUFFIX := .elf
   DEVICE_DTS_DIR := ../dts
+  SOC = bcm$$(CFE_CHIP_ID)
+  DEVICE_DTS = $$(SOC)-$(subst _,-,$(1))
 endef
 
 ATH5K_PACKAGES := kmod-ath5k wpad-basic