diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-09-29 07:27:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 07:27:29 +0200 |
| commit | 2839ee70d38eeea18f3423806bfa2fad6c597c25 (patch) | |
| tree | 1005ac7ff41450a8f6582a593b89ee2ba04b10c0 | |
| parent | c96b95cbab50ccaa6a31fad8ca814280e524ff63 (diff) | |
| parent | 823f6dd12fef61c9af196505f88f039ed84f9548 (diff) | |
| download | master-187ad058-2839ee70d38eeea18f3423806bfa2fad6c597c25.tar.gz master-187ad058-2839ee70d38eeea18f3423806bfa2fad6c597c25.tar.bz2 master-187ad058-2839ee70d38eeea18f3423806bfa2fad6c597c25.zip | |
Merge pull request #100 from wigyori/master
brcm63xx fixes
| -rw-r--r-- | target/linux/brcm63xx/base-files/etc/diag.sh | 2 | ||||
| -rw-r--r-- | target/linux/brcm63xx/dts/ct536plus.dts | 2 | ||||
| -rw-r--r-- | target/linux/brcm63xx/dts/cvg834g.dts | 2 | ||||
| -rw-r--r-- | target/linux/brcm63xx/dts/hg556a-c.dts | 2 | ||||
| -rw-r--r-- | target/linux/brcm63xx/image/bcm63xx.mk | 4 |
5 files changed, 6 insertions, 6 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"; 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"; 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 = <KEY_HELP>; }; wlan { 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 |