diff mbox series

[U-Boot,1/2] configs: am335x_boneblack_vboot_defconfig: Fix regression by enabling BLK and DM support, disable in SPL

Message ID 1564473321-24930-1-git-send-email-sunil.m@techveda.org
State Accepted
Commit a9c5d4ba0ddc9c094d994f8b73318e6db8449c1d
Delegated to: Tom Rini
Headers show
Series [U-Boot,1/2] configs: am335x_boneblack_vboot_defconfig: Fix regression by enabling BLK and DM support, disable in SPL | expand

Commit Message

Suniel Mahesh July 30, 2019, 7:55 a.m. UTC 
From: Suniel Mahesh <sunil.m@techveda.org>

This patch adds BLK and DM support for verified boot on TI AM335x
chipsets. The following compile warnings are removed:

===================== WARNING ======================
This board does not use CONFIG_DM_MMC. Please update
the board to use CONFIG_DM_MMC before the v2019.04 release.
Failure to update by the deadline may result in board removal.
See doc/driver-model/MIGRATION.txt for more info.
====================================================
===================== WARNING ======================
This board does not use CONFIG_DM_USB. Please update
the board to use CONFIG_DM_USB before the v2019.07 release.
Failure to update by the deadline may result in board removal.
See doc/driver-model/MIGRATION.txt for more info.
====================================================

BLK and DM_MMC are enabled by default in SPL as well, which is
making the build to break with an overflow(spl image doesn't
fit into SRAM because of size constraints).

  LD      spl/drivers/built-in.o
  LD      spl/u-boot-spl
arm-linux-ld.bfd: u-boot-spl section .u_boot_list will not fit in region .sram
arm-linux-ld.bfd: region .sram overflowed by 116 bytes
make[1]: *** [spl/u-boot-spl] Error 1
make: *** [spl/u-boot-spl] Error 2

For the above reason BLK and DM_MMC is disabled in SPL.
Built and tested on AM335x device (BeagleboneBlack).

Signed-off-by: Suniel Mahesh <sunil.m@techveda.org>
---
 configs/am335x_boneblack_vboot_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Tom Rini Aug. 1, 2019, 3:36 a.m. UTC | #1 
On Tue, Jul 30, 2019 at 01:25:20PM +0530, sunil.m@techveda.org wrote:

> From: Suniel Mahesh <sunil.m@techveda.org>
> 
> This patch adds BLK and DM support for verified boot on TI AM335x
> chipsets. The following compile warnings are removed:
> 
> ===================== WARNING ======================
> This board does not use CONFIG_DM_MMC. Please update
> the board to use CONFIG_DM_MMC before the v2019.04 release.
> Failure to update by the deadline may result in board removal.
> See doc/driver-model/MIGRATION.txt for more info.
> ====================================================
> ===================== WARNING ======================
> This board does not use CONFIG_DM_USB. Please update
> the board to use CONFIG_DM_USB before the v2019.07 release.
> Failure to update by the deadline may result in board removal.
> See doc/driver-model/MIGRATION.txt for more info.
> ====================================================
> 
> BLK and DM_MMC are enabled by default in SPL as well, which is
> making the build to break with an overflow(spl image doesn't
> fit into SRAM because of size constraints).
> 
>   LD      spl/drivers/built-in.o
>   LD      spl/u-boot-spl
> arm-linux-ld.bfd: u-boot-spl section .u_boot_list will not fit in region .sram
> arm-linux-ld.bfd: region .sram overflowed by 116 bytes
> make[1]: *** [spl/u-boot-spl] Error 1
> make: *** [spl/u-boot-spl] Error 2
> 
> For the above reason BLK and DM_MMC is disabled in SPL.
> Built and tested on AM335x device (BeagleboneBlack).
> 
> Signed-off-by: Suniel Mahesh <sunil.m@techveda.org>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index 9ccbd68..a6c32ac 100644
--- a/configs/am335x_boneblack_vboot_defconfig
+++ b/configs/am335x_boneblack_vboot_defconfig
@@ -33,7 +33,7 @@  CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-# CONFIG_BLK is not set
+# CONFIG_SPL_BLK is not set
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
@@ -42,6 +42,7 @@  CONFIG_DM_I2C=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
+# CONFIG_SPL_DM_MMC is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_SPEED=24000000
 CONFIG_SPI_FLASH_WINBOND=y