Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
Commit 217ab691 authored by Robert Nelson's avatar Robert Nelson
Browse files

eMMC: merge MMCSD_MODE_FS and related config changes


Signed-off-by: default avatarRobert Nelson <robertcnelson@gmail.com>
parent 12be741e
No related merge requests found
......@@ -304,7 +304,8 @@ void board_init_f(ulong dummy)
#ifdef CONFIG_ESM_K3
if (board_ti_k3_is("J721EX-PM2-SOM") ||
board_ti_k3_is("J7200X-PM2-SOM")) {
board_ti_k3_is("J7200X-PM2-SOM") ||
board_ti_k3_is("BBONEAI-64-B0-")) {
ret = uclass_get_device_by_driver(UCLASS_MISC,
DM_GET_DRIVER(k3_esm), &dev);
if (ret)
......@@ -314,7 +315,8 @@ void board_init_f(ulong dummy)
#ifdef CONFIG_ESM_PMIC
if (board_ti_k3_is("J721EX-PM2-SOM") ||
board_ti_k3_is("J7200X-PM2-SOM")) {
board_ti_k3_is("J7200X-PM2-SOM") ||
board_ti_k3_is("BBONEAI-64-B0-")) {
ret = uclass_get_device_by_driver(UCLASS_MISC,
DM_GET_DRIVER(pmic_esm),
&dev);
......@@ -335,7 +337,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device)
{
switch (boot_device) {
case BOOT_DEVICE_MMC1:
return MMCSD_MODE_EMMCBOOT;
return MMCSD_MODE_FS;
case BOOT_DEVICE_MMC2:
return MMCSD_MODE_FS;
default:
......
......@@ -37,6 +37,7 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x900
CONFIG_SPL_HASH_SUPPORT=y
CONFIG_SPL_DMA=y
CONFIG_SPL_I2C_SUPPORT=y
CONFIG_SPL_DM_MAILBOX=y
......
......@@ -6,6 +6,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_SYS_MALLOC_F_LEN=0x70000
CONFIG_SOC_K3_J721E=y
CONFIG_K3_EARLY_CONS=y
CONFIG_K3_SYSFW_IMAGE_MMCSD_RAW_MODE_SECT=0x1900
CONFIG_TARGET_J721E_R5_EVM=y
CONFIG_ENV_SIZE=0x20000
CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
......@@ -33,15 +34,12 @@ CONFIG_SPL_STACK_R=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_EARLY_BSS=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
CONFIG_SPL_DMA=y
CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SPL_FS_EXT4=y
CONFIG_SPL_I2C_SUPPORT=y
CONFIG_SPL_DM_MAILBOX=y
CONFIG_SPL_MTD_SUPPORT=y
CONFIG_SPL_DM_SPI_FLASH=y
CONFIG_SPL_NOR_SUPPORT=y
CONFIG_SPL_DM_RESET=y
CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_POWER_DOMAIN=y
......@@ -64,7 +62,6 @@ CONFIG_CMD_REMOTEPROC=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TIME=y
CONFIG_CMD_FAT=y
CONFIG_CMD_MTDPARTS=y
CONFIG_OF_CONTROL=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_SPL_MULTI_DTB_FIT=y
......@@ -108,13 +105,6 @@ CONFIG_MMC_SDHCI=y
CONFIG_SPL_MMC_SDHCI_ADMA=y
CONFIG_MMC_SDHCI_AM654=y
CONFIG_MTD=y
CONFIG_DM_MTD=y
CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_CFI_FLASH=y
CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
CONFIG_FLASH_CFI_MTD=y
CONFIG_SYS_FLASH_CFI=y
CONFIG_HBMC_AM654=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH_SFDP_SUPPORT=y
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment