dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-03 09:42:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-marvell

Browse Source 
- Fix breakage in helios4: Change U-Boot offset on SPI Flash
- Enable CONFIG_BLK for db-88f6820-amc
This commit is contained in:
Tom Rini
2018-12-21 13:38:09 -05:00
parent 5c676780e1 7a147220c6
commit 562a63e86b
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-mvebu/cpu.c
View File

@@ -283,10 +283,8 @@ int print_cpuinfo(void)
* and sets the correct windows sizes and base addresses accordingly. * and sets the correct windows sizes and base addresses accordingly.
* *
* These values are set in the scratch registers by the Marvell * These values are set in the scratch registers by the Marvell
* DDR3 training code, which is executed by the BootROM before the * DDR3 training code, which is executed by the SPL before the
* main payload (U-Boot) is executed. This training code is currently * main payload (U-Boot) is executed.
* only available in the Marvell U-Boot version. It needs to be
* ported to mainline U-Boot SPL at some point.
*/ */
static void update_sdram_window_sizes(void) static void update_sdram_window_sizes(void)
{ {

3
configs/db-88f6820-amc_defconfig
View File

@@ -43,6 +43,9 @@ CONFIG_EFI_PARTITION=y
CONFIG_DEFAULT_DEVICE_TREE="armada-385-amc" CONFIG_DEFAULT_DEVICE_TREE="armada-385-amc"
CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_SPL_OF_TRANSLATE=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_DM_I2C=y
CONFIG_SYS_I2C_MVTWSI=y CONFIG_SYS_I2C_MVTWSI=y
# CONFIG_MMC is not set # CONFIG_MMC is not set

2
include/configs/helios4.h
View File

@@ -118,7 +118,7 @@
#define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT
#define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_LOAD
#define CONFIG_SPL_SPI_SUPPORT #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 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS
#endif #endif