mirror of
https://github.com/u-boot/u-boot.git
synced 2024-12-11 21:53:29 +08:00
Merge git://git.denx.de/u-boot-marvell
- Fix breakage in helios4: Change U-Boot offset on SPI Flash - Enable CONFIG_BLK for db-88f6820-amc
This commit is contained in:
commit
562a63e86b
@ -283,10 +283,8 @@ int print_cpuinfo(void)
|
||||
* and sets the correct windows sizes and base addresses accordingly.
|
||||
*
|
||||
* These values are set in the scratch registers by the Marvell
|
||||
* DDR3 training code, which is executed by the BootROM before the
|
||||
* main payload (U-Boot) is executed. This training code is currently
|
||||
* only available in the Marvell U-Boot version. It needs to be
|
||||
* ported to mainline U-Boot SPL at some point.
|
||||
* DDR3 training code, which is executed by the SPL before the
|
||||
* main payload (U-Boot) is executed.
|
||||
*/
|
||||
static void update_sdram_window_sizes(void)
|
||||
{
|
||||
|
@ -43,6 +43,9 @@ CONFIG_EFI_PARTITION=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="armada-385-amc"
|
||||
CONFIG_ENV_IS_IN_SPI_FLASH=y
|
||||
CONFIG_SPL_OF_TRANSLATE=y
|
||||
CONFIG_BLK=y
|
||||
# CONFIG_SPL_BLK is not set
|
||||
# CONFIG_BLOCK_CACHE is not set
|
||||
CONFIG_DM_I2C=y
|
||||
CONFIG_SYS_I2C_MVTWSI=y
|
||||
# CONFIG_MMC is not set
|
||||
|
@ -118,7 +118,7 @@
|
||||
#define CONFIG_SPL_SPI_FLASH_SUPPORT
|
||||
#define CONFIG_SPL_SPI_LOAD
|
||||
#define CONFIG_SPL_SPI_SUPPORT
|
||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000
|
||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x30000
|
||||
#define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user