diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-27 09:32:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-27 09:32:37 -0400 |
| commit | 821560fd8e43eecc208c1c52ad24faadb6b52703 (patch) | |
| tree | efb56bc170674d3a6680ca4d343888e9e84403c7 /include/configs/imx6_spl.h | |
| parent | b8a238f1376f16c387765107b9d7f62e4358dd48 (diff) | |
| parent | 65496a34835cb4c9547bd02dd15b018c333add9d (diff) | |
Merge git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/imx6qdl_icore_rqs.h
include/configs/imx6ul_geam.h
include/configs/imx6ul_isiot.h
Diffstat (limited to 'include/configs/imx6_spl.h')
| -rw-r--r-- | include/configs/imx6_spl.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 4598d272d57..bda9541af66 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -35,11 +35,6 @@ */ #define CONFIG_SPL_PAD_TO 0x11000 -/* NAND support */ -#if defined(CONFIG_SPL_NAND_SUPPORT) -#define CONFIG_SPL_NAND_MXS -#endif - /* MMC support */ #if defined(CONFIG_SPL_MMC_SUPPORT) #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 |