diff options
| author | Tom Rini <[email protected]> | 2019-03-10 10:15:50 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-03-10 10:15:50 -0400 |
| commit | bdbf50f80c72b81c37a4fcdce5a92b21b790f888 (patch) | |
| tree | 0fa6f19a5d57e2b1b19da5522f3627514d6883f8 /include | |
| parent | e8e3f2d2d48f97b2c79b698eccedce8f4f880993 (diff) | |
| parent | 3a4511ce4ad9d0955066d47ef3d227fe97208f81 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
- More gen2/gen3 fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/rcar-gen2-common.h | 2 | ||||
| -rw-r--r-- | include/configs/rcar-gen3-common.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index d606da8b0ec..9213d33e217 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -53,6 +53,8 @@ /* SF MTD */ #if defined(CONFIG_SPI_FLASH_MTD) && !defined(CONFIG_SPL_BUILD) #else +#undef CONFIG_DM_SPI +#undef CONFIG_DM_SPI_FLASH #undef CONFIG_SPI_FLASH_MTD #endif diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 06d5d3219ca..20f982165dd 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -48,7 +48,6 @@ #define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) -#define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024) #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* ENV setting */ |