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 <freifunk@adrianschmutzler.de>
This commit is contained in:
		@@ -6,7 +6,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/ {
 | 
					/ {
 | 
				
			||||||
	model = "SKY SR102";
 | 
						model = "SKY SR102";
 | 
				
			||||||
	compatible = "sky,sr102", "brcm,bcm63268";
 | 
						compatible = "sky,sr102", "brcm,bcm63168", "brcm,bcm63268";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	chosen {
 | 
						chosen {
 | 
				
			||||||
		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
							bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
				
			||||||
@@ -6,7 +6,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/ {
 | 
					/ {
 | 
				
			||||||
	model = "Broadcom BCM963269BHR reference board";
 | 
						model = "Broadcom BCM963269BHR reference board";
 | 
				
			||||||
	compatible = "brcm,bcm963269bhr", "brcm,bcm63268";
 | 
						compatible = "brcm,bcm963269bhr", "brcm,bcm63269", "brcm,bcm63268";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	chosen {
 | 
						chosen {
 | 
				
			||||||
		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
							bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
				
			||||||
@@ -6,7 +6,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/ {
 | 
					/ {
 | 
				
			||||||
	model = "Huawei EchoLife HG520v";
 | 
						model = "Huawei EchoLife HG520v";
 | 
				
			||||||
	compatible = "huawei,echolife-hg520v", "brcm,bcm6358";
 | 
						compatible = "huawei,echolife-hg520v", "brcm,bcm6359", "brcm,bcm6358";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	chosen {
 | 
						chosen {
 | 
				
			||||||
		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
							bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
				
			||||||
@@ -6,7 +6,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/ {
 | 
					/ {
 | 
				
			||||||
	model = "SFR Neufbox 6 (Sercomm)";
 | 
						model = "SFR Neufbox 6 (Sercomm)";
 | 
				
			||||||
	compatible = "sfr,neufbox-6-sercomm-r0", "brcm,bcm6362";
 | 
						compatible = "sfr,neufbox-6-sercomm-r0", "brcm,bcm6361", "brcm,bcm6362";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	chosen {
 | 
						chosen {
 | 
				
			||||||
		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
							bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
				
			||||||
@@ -6,7 +6,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/ {
 | 
					/ {
 | 
				
			||||||
	model = "Comtrend WAP-5813n";
 | 
						model = "Comtrend WAP-5813n";
 | 
				
			||||||
	compatible = "comtrend,wap-5813n", "brcm,bcm6368";
 | 
						compatible = "comtrend,wap-5813n", "brcm,bcm6369", "brcm,bcm6368";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	chosen {
 | 
						chosen {
 | 
				
			||||||
		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
							bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
				
			||||||
@@ -6,7 +6,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/ {
 | 
					/ {
 | 
				
			||||||
	model = "Netgear EVG2000";
 | 
						model = "Netgear EVG2000";
 | 
				
			||||||
	compatible = "netgear,evg2000", "brcm,bcm6368";
 | 
						compatible = "netgear,evg2000", "brcm,bcm6369", "brcm,bcm6368";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	chosen {
 | 
						chosen {
 | 
				
			||||||
		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
							bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 | 
				
			||||||
@@ -304,6 +304,7 @@ define Device/brcm_bcm963269bhr
 | 
				
			|||||||
  IMAGES :=
 | 
					  IMAGES :=
 | 
				
			||||||
  CFE_BOARD_ID := 963269BHR
 | 
					  CFE_BOARD_ID := 963269BHR
 | 
				
			||||||
  CFE_CHIP_ID := 63268
 | 
					  CFE_CHIP_ID := 63268
 | 
				
			||||||
 | 
					  SOC := bcm63269
 | 
				
			||||||
  DEVICE_PACKAGES := $(USB2_PACKAGES) kmod-bcm63xx-udc
 | 
					  DEVICE_PACKAGES := $(USB2_PACKAGES) kmod-bcm63xx-udc
 | 
				
			||||||
endef
 | 
					endef
 | 
				
			||||||
TARGET_DEVICES += brcm_bcm963269bhr
 | 
					TARGET_DEVICES += brcm_bcm963269bhr
 | 
				
			||||||
@@ -458,6 +459,7 @@ define Device/comtrend_wap-5813n
 | 
				
			|||||||
  CFE_BOARD_ID := 96369R-1231N
 | 
					  CFE_BOARD_ID := 96369R-1231N
 | 
				
			||||||
  CFE_CHIP_ID := 6368
 | 
					  CFE_CHIP_ID := 6368
 | 
				
			||||||
  FLASH_MB := 8
 | 
					  FLASH_MB := 8
 | 
				
			||||||
 | 
					  SOC := bcm6369
 | 
				
			||||||
  DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 | 
					  DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 | 
				
			||||||
endef
 | 
					endef
 | 
				
			||||||
TARGET_DEVICES += comtrend_wap-5813n
 | 
					TARGET_DEVICES += comtrend_wap-5813n
 | 
				
			||||||
@@ -643,6 +645,7 @@ define Device/huawei_echolife-hg520v
 | 
				
			|||||||
  CFE_BOARD_ID := HW6358GW_B
 | 
					  CFE_BOARD_ID := HW6358GW_B
 | 
				
			||||||
  CFE_CHIP_ID := 6358
 | 
					  CFE_CHIP_ID := 6358
 | 
				
			||||||
  CFE_EXTRAS += --rsa-signature "EchoLife_HG520v"
 | 
					  CFE_EXTRAS += --rsa-signature "EchoLife_HG520v"
 | 
				
			||||||
 | 
					  SOC := bcm6359
 | 
				
			||||||
  DEVICE_PACKAGES := $(B43_PACKAGES)
 | 
					  DEVICE_PACKAGES := $(B43_PACKAGES)
 | 
				
			||||||
endef
 | 
					endef
 | 
				
			||||||
TARGET_DEVICES += huawei_echolife-hg520v
 | 
					TARGET_DEVICES += huawei_echolife-hg520v
 | 
				
			||||||
@@ -823,6 +826,7 @@ define Device/netgear_evg2000
 | 
				
			|||||||
  BLOCK_SIZE := 0x20000
 | 
					  BLOCK_SIZE := 0x20000
 | 
				
			||||||
  NETGEAR_BOARD_ID := U12H154T90_NETGEAR
 | 
					  NETGEAR_BOARD_ID := U12H154T90_NETGEAR
 | 
				
			||||||
  NETGEAR_REGION := 1
 | 
					  NETGEAR_REGION := 1
 | 
				
			||||||
 | 
					  SOC := bcm6369
 | 
				
			||||||
  DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 | 
					  DEVICE_PACKAGES := $(B43_PACKAGES) $(USB2_PACKAGES)
 | 
				
			||||||
endef
 | 
					endef
 | 
				
			||||||
TARGET_DEVICES += netgear_evg2000
 | 
					TARGET_DEVICES += netgear_evg2000
 | 
				
			||||||
@@ -1002,6 +1006,7 @@ define Device/sfr_neufbox-6-sercomm-r0
 | 
				
			|||||||
  CFE_BOARD_ID := NB6-SER-r0
 | 
					  CFE_BOARD_ID := NB6-SER-r0
 | 
				
			||||||
  CFE_CHIP_ID := 6362
 | 
					  CFE_CHIP_ID := 6362
 | 
				
			||||||
  CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))"
 | 
					  CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))"
 | 
				
			||||||
 | 
					  SOC := bcm6361
 | 
				
			||||||
  DEVICE_PACKAGES := $(USB2_PACKAGES)
 | 
					  DEVICE_PACKAGES := $(USB2_PACKAGES)
 | 
				
			||||||
endef
 | 
					endef
 | 
				
			||||||
TARGET_DEVICES += sfr_neufbox-6-sercomm-r0
 | 
					TARGET_DEVICES += sfr_neufbox-6-sercomm-r0
 | 
				
			||||||
@@ -1013,6 +1018,7 @@ define Device/sky_sr102
 | 
				
			|||||||
  CFE_BOARD_ID := BSKYB_63168
 | 
					  CFE_BOARD_ID := BSKYB_63168
 | 
				
			||||||
  CFE_CHIP_ID := 63268
 | 
					  CFE_CHIP_ID := 63268
 | 
				
			||||||
  CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))"
 | 
					  CFE_EXTRAS += --rsa-signature "$(VERSION_DIST)-$(firstword $(subst -,$(space),$(REVISION)))"
 | 
				
			||||||
 | 
					  SOC := bcm63168
 | 
				
			||||||
  DEVICE_PACKAGES := $(USB2_PACKAGES)
 | 
					  DEVICE_PACKAGES := $(USB2_PACKAGES)
 | 
				
			||||||
endef
 | 
					endef
 | 
				
			||||||
TARGET_DEVICES += sky_sr102
 | 
					TARGET_DEVICES += sky_sr102
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user