Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit b414527f799b9a7b638bb43bd4f6e66efc27adf9

Authored by Ye Li
1 parent 894d376542
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga and in 4 other branches smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga

MLK-20945-6 spl: Fix DM_SPI_FLASH build error in SPL 

SPL should not use DM_SPI_FLASH, this is already cleaned in
Makefile.uncmd_spl, but not in config_uncmd_spl.h

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit cf8468482ec3cceb05700a326df044dc41f38793)

Showing 1 changed file with 1 additions and 0 deletions Inline Diff

include/config_uncmd_spl.h
Diff comments   View file @ b414527
1 /* 1 /*
2 * (C) Copyright 2012 2 * (C) Copyright 2012
3 * Ilya Yanok, ilya.yanok@gmail.com 3 * Ilya Yanok, ilya.yanok@gmail.com
4 * 4 *
5 * SPDX-License-Identifier: GPL-2.0+ 5 * SPDX-License-Identifier: GPL-2.0+
6 */ 6 */
7 7
8 #ifndef __CONFIG_UNCMD_SPL_H__ 8 #ifndef __CONFIG_UNCMD_SPL_H__
9 #define __CONFIG_UNCMD_SPL_H__ 9 #define __CONFIG_UNCMD_SPL_H__
10 10
11 #ifdef CONFIG_SPL_BUILD 11 #ifdef CONFIG_SPL_BUILD
12 /* SPL needs only BOOTP + TFTP so undefine other stuff to save space */ 12 /* SPL needs only BOOTP + TFTP so undefine other stuff to save space */
13 13
14 #ifndef CONFIG_SPL_DM 14 #ifndef CONFIG_SPL_DM
15 #undef CONFIG_DM_SERIAL 15 #undef CONFIG_DM_SERIAL
16 #undef CONFIG_DM_GPIO 16 #undef CONFIG_DM_GPIO
17 #undef CONFIG_DM_I2C 17 #undef CONFIG_DM_I2C
18 #undef CONFIG_DM_SPI 18 #undef CONFIG_DM_SPI
19 #undef CONFIG_DM_SPI_FLASH
19 #undef CONFIG_DM_USB 20 #undef CONFIG_DM_USB
20 #endif 21 #endif
21 22
22 #undef CONFIG_DM_WARN 23 #undef CONFIG_DM_WARN
23 #undef CONFIG_DM_STDIO 24 #undef CONFIG_DM_STDIO
24 25
25 #endif /* CONFIG_SPL_BUILD */ 26 #endif /* CONFIG_SPL_BUILD */
26 #endif /* __CONFIG_UNCMD_SPL_H__ */ 27 #endif /* __CONFIG_UNCMD_SPL_H__ */
27 28