diff options
author | Tom Rini <trini@konsulko.com> | 2020-08-12 06:03:46 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-08-12 06:03:46 +0300 |
commit | c25344ff9ae1d764a8e85296736d6e150e34b4fd (patch) | |
tree | 3fa53ec91a805d19b4c4ab7a30f60d2bba2d5554 /include | |
parent | b298720900752967dd46a5b54a5a303eb11eed95 (diff) | |
parent | db6451ec0e8483f76f3364293d48e86249c52322 (diff) | |
download | u-boot-c25344ff9ae1d764a8e85296736d6e150e34b4fd.tar.xz |
Merge tag 'ti-v2020.10-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
- Added support for J7200 evm
- DM_ETH and DM_USB migrations for omap3
- USB DFU and mass storage support for AM65x evm
- RTI watchdog support for K3 devices
- Fix an issue with L3 cache on K3 devices
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/am65x_evm.h | 6 | ||||
-rw-r--r-- | include/configs/j721e_evm.h | 4 | ||||
-rw-r--r-- | include/spl.h | 14 |
3 files changed, 21 insertions, 3 deletions
diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index 4de0dacee3..df0605657a 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -22,6 +22,7 @@ #ifdef CONFIG_TARGET_AM654_A53_EVM #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SPL_TEXT_BASE + \ CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE) +#define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x20000 #else /* * Maximum size in memory allocated to the SPL BSS. Keep it as tight as @@ -44,6 +45,7 @@ /* Configure R5 SPL post-relocation malloc pool in DDR */ #define CONFIG_SYS_SPL_MALLOC_START 0x84000000 #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_16M +#define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x5000 #endif #ifdef CONFIG_SYS_K3_SPL_ATF @@ -124,8 +126,8 @@ "rootfstype=ubifs root=ubi0:rootfs rw ubi.mtd=ospi.rootfs\0" #define EXTRA_ENV_DFUARGS \ - "dfu_bufsiz=0x20000\0" \ DFU_ALT_INFO_MMC \ + DFU_ALT_INFO_RAM \ DFU_ALT_INFO_EMMC \ DFU_ALT_INFO_OSPI @@ -140,6 +142,8 @@ EXTRA_ENV_RPROC_SETTINGS \ EXTRA_ENV_DFUARGS +#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 + /* Now for the remaining common defines */ #include <configs/ti_armv7_common.h> diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index e1681af3f6..c8a76037ff 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -20,7 +20,7 @@ #define CONFIG_SYS_SDRAM_BASE1 0x880000000 /* SPL Loader Configuration */ -#ifdef CONFIG_TARGET_J721E_A72_EVM +#if defined(CONFIG_TARGET_J721E_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM) #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SPL_TEXT_BASE + \ CONFIG_SYS_K3_NON_SECURE_MSRAM_SIZE) /* Image load address in RAM for DFU boot*/ @@ -127,7 +127,7 @@ DFU_ALT_INFO_RAM \ DFU_ALT_INFO_OSPI -#ifdef CONFIG_TARGET_J721E_A72_EVM +#if defined(CONFIG_TARGET_J721E_A72_EVM) || defined(CONFIG_TARGET_J7200_A72_EVM) #define EXTRA_ENV_J721E_BOARD_SETTINGS_MTD \ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" diff --git a/include/spl.h b/include/spl.h index 580e4e024f..b72dfc7e3d 100644 --- a/include/spl.h +++ b/include/spl.h @@ -503,6 +503,20 @@ int spl_mmc_load(struct spl_image_info *spl_image, int raw_part, unsigned long raw_sect); +/** + * spl_usb_load() - Load an image file from USB mass storage + * + * @param spl_image Image data filled in by loading process + * @param bootdev Describes which device to load from + * @param raw_part Fat partition to load from + * @param filename Name of file to load + * + * @return 0 on success, otherwise error code + */ +int spl_usb_load(struct spl_image_info *spl_image, + struct spl_boot_device *bootdev, + int partition, const char *filename); + int spl_ymodem_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev); |