diff options
| author | Luka Kovacic <luka.kovacic@sartura.hr> | 2020-07-23 11:56:40 +0300 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2020-08-06 15:12:14 +0300 |
| commit | 14133650d85532b99accdd5f13bf415d94301ef9 (patch) | |
| tree | fd64c5972e7772be03006bdb5d3cbf2f6de30a40 | |
| parent | 58091ee55be78fea84c9d1d915a0d73cd9f035be (diff) | |
| download | u-boot-14133650d85532b99accdd5f13bf415d94301ef9.tar.xz | |
arm: mvebu: Update CRS305-1G-4S board flash layout
Update the MikroTik CRS305-1G-4S flash layout to support redundant UBI
partitions.
Additionally enable the UBI commands in crs305-1g-4s_defconfig.
Signed-off-by: Luka Kovacic <luka.kovacic@sartura.hr>
Cc: Luka Perkov <luka.perkov@sartura.hr>
Cc: Jakov Petrina <jakov.petrina@sartura.hr>
Reviewed-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | arch/arm/dts/armada-xp-crs305-1g-4s.dtsi | 10 | ||||
| -rw-r--r-- | configs/crs305-1g-4s_defconfig | 9 |
2 files changed, 13 insertions, 6 deletions
diff --git a/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi b/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi index c8839eac94..1a74ecd5b5 100644 --- a/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi +++ b/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi @@ -95,16 +95,16 @@ m25p,fast-read; partition@u-boot { - reg = <0x00000000 0x00080000>; + reg = <0x00000000 0x001f0000>; label = "u-boot"; }; partition@u-boot-env { - reg = <0x00080000 0x00010000>; + reg = <0x001f0000 0x00010000>; label = "u-boot-env"; }; - partition@firmware { - reg = <0x00090000 0x00f70000>; - label = "firmware"; + partition@ubi1 { + reg = <0x00200000 0x00e00000>; + label = "ubi1"; }; }; diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig index 2afd26dd83..f50dab6b85 100644 --- a/configs/crs305-1g-4s_defconfig +++ b/configs/crs305-1g-4s_defconfig @@ -5,15 +5,18 @@ CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_CRS3XX_98DX3236=y CONFIG_ENV_SIZE=0x10000 -CONFIG_ENV_OFFSET=0x80000 +CONFIG_ENV_OFFSET=0x1F0000 CONFIG_ENV_SECT_SIZE=0x10000 +CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_BUILD_TARGET="u-boot.kwb" CONFIG_DEFAULT_DEVICE_TREE="armada-xp-crs305-1g-4s" CONFIG_FIT=y +CONFIG_FIT_ENABLE_SHA256_SUPPORT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_BEST_MATCH=y CONFIG_USE_PREBOOT=y CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_HUSH_PARSER=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, to stop use 's' key\n" CONFIG_AUTOBOOT_STOP_STR="s" @@ -23,11 +26,15 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_MTD=y CONFIG_CMD_SPI=y CONFIG_CMD_CACHE=y +CONFIG_CMD_UBI=y +CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_BLK=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_DM_MTD=y |