From ab45e1aa2a43d8a7ac8434dc7cd7d21510b35fc2 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 28 Sep 2016 09:48:19 +0200 Subject: brcm63xx: fix CVG834G compatible string The CVG834G claimed to be a BCM6348, but is actually BCM3368. Since we don't test against it, this was harmless. Signed-off-by: Jonas Gorski --- target/linux/brcm63xx/dts/cvg834g.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/brcm63xx/dts/cvg834g.dts b/target/linux/brcm63xx/dts/cvg834g.dts index 73ae58d610..519f1f53af 100644 --- a/target/linux/brcm63xx/dts/cvg834g.dts +++ b/target/linux/brcm63xx/dts/cvg834g.dts @@ -6,7 +6,7 @@ / { model = "Netgear CVG834G"; - compatible = "netgear,cvg834g", "brcm,bcm6348"; + compatible = "netgear,cvg834g", "brcm,bcm3368"; chosen { bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; -- cgit v1.2.3 From 62e4b4f6222baa67fb01fd69988040c512a71517 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 28 Sep 2016 09:48:55 +0200 Subject: brcm63xx: fix image generation with offsets/blocksizes != 64K Defer the CFE_EXTRAs evaluation to allow overriden BLOCK_SIZE and IMAGE_OFFSET take effect, and replace the unused IMAGE_SIZE with IMAGE_OFFSET in DEVICE_VARS. This fixes image generation for targets using different offsets or blocksizes. Signed-off-by: Jonas Gorski --- target/linux/brcm63xx/image/bcm63xx.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/brcm63xx/image/bcm63xx.mk b/target/linux/brcm63xx/image/bcm63xx.mk index e42c233a64..af14168b74 100644 --- a/target/linux/brcm63xx/image/bcm63xx.mk +++ b/target/linux/brcm63xx/image/bcm63xx.mk @@ -28,9 +28,9 @@ define Device/bcm63xx FLASH_MB := 4 CFE_BOARD_ID := CFE_CHIP_ID := - CFE_EXTRAS := --block-size $$(BLOCK_SIZE) --image-offset $$(if $$(IMAGE_OFFSET),$$(IMAGE_OFFSET),$$(BLOCK_SIZE)) + CFE_EXTRAS = --block-size $$(BLOCK_SIZE) --image-offset $$(if $$(IMAGE_OFFSET),$$(IMAGE_OFFSET),$$(BLOCK_SIZE)) endef -DEVICE_VARS += BLOCK_SIZE FLASH_MB IMAGE_SIZE +DEVICE_VARS += BLOCK_SIZE FLASH_MB IMAGE_OFFSET DEVICE_VARS += CFE_BOARD_ID CFE_CHIP_ID CFE_EXTRAS define Device/bcm63xx_netgear -- cgit v1.2.3 From 5d91613a4e6310fc26e59f113f5248f69375797f Mon Sep 17 00:00:00 2001 From: "Signed-off-by: Daniel Gonzalez" Date: Wed, 28 Sep 2016 09:49:26 +0200 Subject: brcm63xx: fix HG556a C button One button of the HG556a-C has the wrong GPIO pin defined in the dts file, fix it Signed-off-by: Daniel Gonzalez --- target/linux/brcm63xx/dts/hg556a-c.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/brcm63xx/dts/hg556a-c.dts b/target/linux/brcm63xx/dts/hg556a-c.dts index 3e64a2fb18..ada2a8ca0c 100644 --- a/target/linux/brcm63xx/dts/hg556a-c.dts +++ b/target/linux/brcm63xx/dts/hg556a-c.dts @@ -21,7 +21,7 @@ help { label = "help"; - gpios = <&gpio0 8 1>; + gpios = <&gpio1 4 1>; linux,code = ; }; wlan { -- cgit v1.2.3 From 823f6dd12fef61c9af196505f88f039ed84f9548 Mon Sep 17 00:00:00 2001 From: "Signed-off-by: Daniel Gonzalez" Date: Wed, 28 Sep 2016 09:49:57 +0200 Subject: brcm63xx: fix CT-536p/CT-5621T support Fix support for the Comtrend CT-536+, CT-5361 and CT-5621T routers support. Currently the firmware is broken for these routers, because there is a missing bar in the code at the DTS file avoiding to match with DTS stuff at the kernel. This causes the router boots without ethernet connectivity. The status led also has a typo. Signed-off-by: Daniel Gonzalez Signed-off-by: Jonas Gorski --- target/linux/brcm63xx/base-files/etc/diag.sh | 2 +- target/linux/brcm63xx/dts/ct536plus.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/brcm63xx/base-files/etc/diag.sh b/target/linux/brcm63xx/base-files/etc/diag.sh index 6ac2459c92..51756ae835 100644 --- a/target/linux/brcm63xx/base-files/etc/diag.sh +++ b/target/linux/brcm63xx/base-files/etc/diag.sh @@ -58,7 +58,7 @@ set_state() { cpva642) status_led="CPVA642:green:power:" ;; - ct536_ct5621) + ct-536p_5621t) status_led="CT536_CT5621:green:power" ;; cvg834g) diff --git a/target/linux/brcm63xx/dts/ct536plus.dts b/target/linux/brcm63xx/dts/ct536plus.dts index 91ca91c9f1..148e60e73d 100644 --- a/target/linux/brcm63xx/dts/ct536plus.dts +++ b/target/linux/brcm63xx/dts/ct536plus.dts @@ -6,7 +6,7 @@ / { model = "Comtrend CT-536+/CT-5621T"; - compatible = "comtrend,ct536+", "brcm,bcm6348"; + compatible = "comtrend,ct-536+", "brcm,bcm6348"; chosen { bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"; -- cgit v1.2.3