diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-21 13:38:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-21 13:38:09 -0500 |
| commit | 562a63e86bc7b308a328a7bbdf0db237855c39a8 (patch) | |
| tree | 4a43bc9ed8e360e64bf130224c599e866af18194 /include | |
| parent | 5c676780e116dc79c1819d6c49a2aa53e1053e04 (diff) | |
| parent | 7a147220c6459aeb7c6b6f7afe4330dcce077c9b (diff) | |
| download | u-boot-562a63e86bc7b308a328a7bbdf0db237855c39a8.tar.gz u-boot-562a63e86bc7b308a328a7bbdf0db237855c39a8.tar.bz2 u-boot-562a63e86bc7b308a328a7bbdf0db237855c39a8.zip | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/helios4.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/helios4.h b/include/configs/helios4.h index 3157225f06..4e98f19a40 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -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 |