diff options
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/Kconfig | 3 | ||||
| -rw-r--r-- | common/spl/spl_mmc.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index c08045f9c8d..b076f49ac00 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -270,6 +270,8 @@ config SPL_TEXT_BASE default 0x40200000 if OMAP34XX default 0x402F4000 if AM43XX default 0x402F0400 if AM33XX + default 0x80080000 if ARCH_K3 && ARM64 + default 0x43c00000 if ARCH_K3 && !ARM64 default 0x00908000 if ARCH_MX6 default 0x00912000 if ARCH_MX7 default 0x40301350 if OMAP54XX @@ -537,6 +539,7 @@ if SPL_SYS_MMCSD_RAW_MODE choice prompt "Method for locating next phase of boot (e.g. U-Boot)" + default SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR if MVEBU_SPL_BOOT_DEVICE_MMC config SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR bool "MMC raw mode: by sector" diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index fe4230170a0..d06f9f0dee6 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -411,6 +411,7 @@ int spl_mmc_load(struct spl_image_info *spl_image, return 0; #endif /* If RAW mode fails, try FS mode. */ + fallthrough; #ifdef CONFIG_SYS_MMCSD_FS_BOOT case MMCSD_MODE_FS: debug("spl: mmc boot mode: fs\n"); |