From 7f1ec1cc7944f15a7ae7f7973c61ada49ba2ee54 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 5 Jan 2020 13:14:43 +0100 Subject: [PATCH] brcm63xx: be more specific about SOC names This uses the specific SOC names for several devices where the Chip ID was used incorrectly before. Signed-off-by: Adrian Schmutzler --- .../dts/{bcm63268-sky-sr102.dts => bcm63168-sky-sr102.dts} | 2 +- ...brcm-bcm963269bhr.dts => bcm63269-brcm-bcm963269bhr.dts} | 2 +- ...holife-hg520v.dts => bcm6359-huawei-echolife-hg520v.dts} | 2 +- ...-sercomm-r0.dts => bcm6361-sfr-neufbox-6-sercomm-r0.dts} | 2 +- ...omtrend-wap-5813n.dts => bcm6369-comtrend-wap-5813n.dts} | 2 +- ...6368-netgear-evg2000.dts => bcm6369-netgear-evg2000.dts} | 2 +- target/linux/brcm63xx/image/bcm63xx.mk | 6 ++++++ 7 files changed, 12 insertions(+), 6 deletions(-) rename target/linux/brcm63xx/dts/{bcm63268-sky-sr102.dts => bcm63168-sky-sr102.dts} (97%) rename target/linux/brcm63xx/dts/{bcm63268-brcm-bcm963269bhr.dts => bcm63269-brcm-bcm963269bhr.dts} (93%) rename target/linux/brcm63xx/dts/{bcm6358-huawei-echolife-hg520v.dts => bcm6359-huawei-echolife-hg520v.dts} (93%) rename target/linux/brcm63xx/dts/{bcm6362-sfr-neufbox-6-sercomm-r0.dts => bcm6361-sfr-neufbox-6-sercomm-r0.dts} (95%) rename target/linux/brcm63xx/dts/{bcm6368-comtrend-wap-5813n.dts => bcm6369-comtrend-wap-5813n.dts} (97%) rename target/linux/brcm63xx/dts/{bcm6368-netgear-evg2000.dts => bcm6369-netgear-evg2000.dts} (96%) diff --git a/target/linux/brcm63xx/dts/bcm63268-sky-sr102.dts b/target/linux/brcm63xx/dts/bcm63168-sky-sr102.dts similarity index 97% rename from target/linux/brcm63xx/dts/bcm63268-sky-sr102.dts rename to target/linux/brcm63xx/dts/bcm63168-sky-sr102.dts index 45c1302489..e47822af89 100644 --- a/target/linux/brcm63xx/dts/bcm63268-sky-sr102.dts +++ b/target/linux/brcm63xx/dts/bcm63168-sky-sr102.dts @@ -6,7 +6,7 @@ / { model = "SKY SR102"; - compatible = "sky,sr102", "brcm,bcm63268"; + compatible = "sky,sr102", "brcm,bcm63168", "brcm,bcm63268"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/bcm63268-brcm-bcm963269bhr.dts b/target/linux/brcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts similarity index 93% rename from target/linux/brcm63xx/dts/bcm63268-brcm-bcm963269bhr.dts rename to target/linux/brcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts index bb1609e040..bcd2286cf9 100644 --- a/target/linux/brcm63xx/dts/bcm63268-brcm-bcm963269bhr.dts +++ b/target/linux/brcm63xx/dts/bcm63269-brcm-bcm963269bhr.dts @@ -6,7 +6,7 @@ / { model = "Broadcom BCM963269BHR reference board"; - compatible = "brcm,bcm963269bhr", "brcm,bcm63268"; + compatible = "brcm,bcm963269bhr", "brcm,bcm63269", "brcm,bcm63268"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg520v.dts b/target/linux/brcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts similarity index 93% rename from target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg520v.dts rename to target/linux/brcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts index 2176ea88d2..5809b6da4e 100644 --- a/target/linux/brcm63xx/dts/bcm6358-huawei-echolife-hg520v.dts +++ b/target/linux/brcm63xx/dts/bcm6359-huawei-echolife-hg520v.dts @@ -6,7 +6,7 @@ / { model = "Huawei EchoLife HG520v"; - compatible = "huawei,echolife-hg520v", "brcm,bcm6358"; + compatible = "huawei,echolife-hg520v", "brcm,bcm6359", "brcm,bcm6358"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts b/target/linux/brcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts similarity index 95% rename from target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts rename to target/linux/brcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts index 031aff0748..4498272887 100644 --- a/target/linux/brcm63xx/dts/bcm6362-sfr-neufbox-6-sercomm-r0.dts +++ b/target/linux/brcm63xx/dts/bcm6361-sfr-neufbox-6-sercomm-r0.dts @@ -6,7 +6,7 @@ / { model = "SFR Neufbox 6 (Sercomm)"; - compatible = "sfr,neufbox-6-sercomm-r0", "brcm,bcm6362"; + compatible = "sfr,neufbox-6-sercomm-r0", "brcm,bcm6361", "brcm,bcm6362"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/bcm6368-comtrend-wap-5813n.dts b/target/linux/brcm63xx/dts/bcm6369-comtrend-wap-5813n.dts similarity index 97% rename from target/linux/brcm63xx/dts/bcm6368-comtrend-wap-5813n.dts rename to target/linux/brcm63xx/dts/bcm6369-comtrend-wap-5813n.dts index abf5ea4f6b..c6db2721de 100644 --- a/target/linux/brcm63xx/dts/bcm6368-comtrend-wap-5813n.dts +++ b/target/linux/brcm63xx/dts/bcm6369-comtrend-wap-5813n.dts @@ -6,7 +6,7 @@ / { model = "Comtrend WAP-5813n"; - compatible = "comtrend,wap-5813n", "brcm,bcm6368"; + compatible = "comtrend,wap-5813n", "brcm,bcm6369", "brcm,bcm6368"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/dts/bcm6368-netgear-evg2000.dts b/target/linux/brcm63xx/dts/bcm6369-netgear-evg2000.dts similarity index 96% rename from target/linux/brcm63xx/dts/bcm6368-netgear-evg2000.dts rename to target/linux/brcm63xx/dts/bcm6369-netgear-evg2000.dts index 1508291f4b..93d4792740 100644 --- a/target/linux/brcm63xx/dts/bcm6368-netgear-evg2000.dts +++ b/target/linux/brcm63xx/dts/bcm6369-netgear-evg2000.dts @@ -6,7 +6,7 @@ / { model = "Netgear EVG2000"; - compatible = "netgear,evg2000", "brcm,bcm6368"; + compatible = "netgear,evg2000", "brcm,bcm6369", "brcm,bcm6368"; chosen { bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk index bc96b2a24e..265fa0958a 100644 --- a/target/linux/brcm63xx/image/bcm63xx.mk +++ b/target/linux/brcm63xx/image/bcm63xx.mk @@ -304,6 +304,7 @@ define Device/brcm_bcm963269bhr IMAGES := CFE_BOARD_ID := 963269BHR CFE_CHIP_ID := 63268 + SOC := bcm63269 DEVICE_PACKAGES := $(USB2_PACKAGES) kmod-bcm63xx-udc endef TARGET_DEVICES += brcm_bcm963269bhr @@ -458,6 +459,7 @@ define Device/comtrend_wap-5813n CFE_BOARD_ID := 96369R-1231N CFE_CHIP_ID := 6368 FLASH_MB := 8 + SOC := bcm6369 DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef TARGET_DEVICES += comtrend_wap-5813n @@ -643,6 +645,7 @@ define Device/huawei_echolife-hg520v CFE_BOARD_ID := HW6358GW_B CFE_CHIP_ID := 6358 CFE_EXTRAS += --rsa-signature "EchoLife_HG520v" + SOC := bcm6359 DEVICE_PACKAGES := $(B43_PACKAGES) endef TARGET_DEVICES += huawei_echolife-hg520v @@ -823,6 +826,7 @@ define Device/netgear_evg2000 BLOCK_SIZE := 0x20000 NETGEAR_BOARD_ID := U12H154T90_NETGEAR NETGEAR_REGION := 1 + SOC := bcm6369 DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES) endef TARGET_DEVICES += netgear_evg2000 @@ -1002,6 +1006,7 @@ define Device/sfr_neufbox-6-sercomm-r0 CFE_BOARD_ID := NB6-SER-r0 CFE_CHIP_ID := 6362 CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))" + SOC := bcm6361 DEVICE_PACKAGES := $(USB2_PACKAGES) endef TARGET_DEVICES += sfr_neufbox-6-sercomm-r0 @@ -1013,6 +1018,7 @@ define Device/sky_sr102 CFE_BOARD_ID := BSKYB_63168 CFE_CHIP_ID := 63268 CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))" + SOC := bcm63168 DEVICE_PACKAGES := $(USB2_PACKAGES) endef TARGET_DEVICES += sky_sr102