From e73c61a978c56d41a2cdae4b5a2ca660aec4931b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Tue, 2 Jun 2020 18:04:45 +0200 Subject: [PATCH] bcm63xx: vg-8050: switch to bcm-wfi-split MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allows to keep a backup firmware in case active firmware is corrupted. Also fix hsspi address warning. Signed-off-by: Álvaro Fernández Rojas --- target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts | 10 +++++----- target/linux/bcm63xx/image/bcm63xx_nand.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts b/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts index 93a1cb8fa1..01158a3791 100644 --- a/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts +++ b/target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts @@ -107,7 +107,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hsspi_cs5>; - switch@0 { + switch@5 { compatible = "brcm,bcm53125"; reg = <5>; spi-max-frequency = <781000>; @@ -178,16 +178,16 @@ #address-cells = <1>; #size-cells = <1>; - cferom@0 { + partition@0 { label = "cferom"; reg = <0x0000000 0x0020000>; read-only; }; - wfi@20000 { - compatible = "brcm,wfi"; + partition@20000 { + compatible = "brcm,wfi-split"; label = "wfi"; - reg = <0x0020000 0x7ee0000>; + reg = <0x0020000 0x7a80000>; }; }; }; diff --git a/target/linux/bcm63xx/image/bcm63xx_nand.mk b/target/linux/bcm63xx/image/bcm63xx_nand.mk index e1aeed66db..74f23f52af 100644 --- a/target/linux/bcm63xx/image/bcm63xx_nand.mk +++ b/target/linux/bcm63xx/image/bcm63xx_nand.mk @@ -59,7 +59,7 @@ define Device/comtrend_vg-8050 SUBPAGESIZE := 512 VID_HDR_OFFSET := 2048 DEVICE_PACKAGES += $(USB2_PACKAGES) - CFE_WFI_VERSION := 0x5731 + CFE_WFI_VERSION := 0x5732 CFE_WFI_FLASH_TYPE := 3 endef TARGET_DEVICES += comtrend_vg-8050