[PATCH 5/5] arm: mvebu: Update CRS305-1G-4S board flash layout

[Luka Kovacic]

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 at sartura.hr>
Cc: Luka Perkov <luka.perkov at sartura.hr>
Cc: Jakov Petrina <jakov.petrina at sartura.hr>
---
 arch/arm/dts/armada-xp-crs305-1g-4s.dtsi | 10 +++++-----
 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 at u-boot {
-			reg = <0x00000000 0x00080000>;
+			reg = <0x00000000 0x001f0000>;
 			label = "u-boot";
 		};
 		partition at u-boot-env {
-			reg = <0x00080000 0x00010000>;
+			reg = <0x001f0000 0x00010000>;
 			label = "u-boot-env";
 		};
-		partition at firmware {
-			reg = <0x00090000 0x00f70000>;
-			label = "firmware";
+		partition at ubi1 {
+			reg = <0x00200000 0x00e00000>;
+			label = "ubi1";
 		};
 
 	};
diff --git a/configs/crs305-1g-4s_defconfig b/configs/crs305-1g-4s_defconfig
index a360fc5d3f..a62b14e856 100644
--- a/configs/crs305-1g-4s_defconfig
+++ b/configs/crs305-1g-4s_defconfig
@@ -5,14 +5,17 @@ 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_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"
@@ -22,11 +25,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_DEFAULT_DEVICE_TREE="armada-xp-crs305-1g-4s"
 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
-- 
2.26.2