From: Tom Rini <trini@konsulko.com>
Date: Tue, 26 May 2020 19:06:14 +0000 (-0400)
Subject: bcmstb: Migrate CONFIG_CMD_EXT[24]
X-Git-Tag: v2020.07-rc4~6^2~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=559c99f62818749c77f9078af929b214a0a7f819;p=oweals%2Fu-boot.git

bcmstb: Migrate CONFIG_CMD_EXT[24]

The common config header for bcm7260 and bcm7445 enable
CONFIG_CMD_EXT2/EXT4 but the defconfigs do not.  This results in the
commands being disabled.  Enable them via the defconfig.

Cc: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/configs/bcm7260_defconfig b/configs/bcm7260_defconfig
index d467e62dee..4ddca7cc7f 100644
--- a/configs/bcm7260_defconfig
+++ b/configs/bcm7260_defconfig
@@ -14,6 +14,8 @@ CONFIG_PREBOOT="fdt addr ${fdtcontroladdr};fdt move ${fdtcontroladdr} ${fdtsavea
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot>"
 CONFIG_CMD_MMC=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_EXT4=y
 CONFIG_EFI_PARTITION=y
 CONFIG_OF_PRIOR_STAGE=y
 CONFIG_ENV_IS_IN_MMC=y
diff --git a/configs/bcm7445_defconfig b/configs/bcm7445_defconfig
index 2c71a5efed..85dcdded9d 100644
--- a/configs/bcm7445_defconfig
+++ b/configs/bcm7445_defconfig
@@ -17,6 +17,8 @@ CONFIG_SYS_PROMPT="U-Boot>"
 CONFIG_CMD_MMC=y
 CONFIG_CMD_SF_TEST=y
 CONFIG_CMD_SPI=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_EXT4=y
 CONFIG_OF_PRIOR_STAGE=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h
index 5f6bf62524..b906c750ed 100644
--- a/include/configs/bcmstb.h
+++ b/include/configs/bcmstb.h
@@ -129,7 +129,6 @@ extern phys_addr_t prior_stage_fdt_address;
  */
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_EXT2
 
 /*
  * Flash configuration.
@@ -142,8 +141,6 @@ extern phys_addr_t prior_stage_fdt_address;
  * Filesystem configuration.
  */
 #define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_EXT4
-#define CONFIG_FS_EXT4
 #define CONFIG_CMD_FS_GENERIC
 
 /*