summaryrefslogtreecommitdiff
path: root/include/configs/rk3399_common.h
diff options
context:
space:
mode:
authorJakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>2017-03-29 13:31:30 +0200
committerSimon Glass <sjg@chromium.org>2017-04-04 20:01:57 -0600
commit094f67a6c5e0650138058880d6aca57bd3211f10 (patch)
tree524f9f3e9e931ffd64119d9b216924dd65878ca8 /include/configs/rk3399_common.h
parentdb4cc9a034002207e2fba0c217074cd2ebd610fc (diff)
rockchip: spi: rk3399: move CONFIG_SPI and CONFIG_SPI_FLASH to defconfig
On the RK3399-Q7 we need to enable a number of configuration options (e.g. CONFIG_SPI_FLASH_WINBND) dependent on Kconfig seeing CONFIG_SPI and CONFIG_SPI_FLASH active. To allow for these being defined in Kconfig (e.g. via defconfig) and to avoid a warning on having the macro defined multiple times, we remove them from the common header file. Note that the rk3399-evb does not currently have the rk_spi.c driver active (i.e. CONFIG_ROCKCHIP_SPI), so there's no change to the evb-rk3399_defconfig as part of this change. X-AffectedPlatforms: RK3399-Q7 Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Tested-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/configs/rk3399_common.h')
-rw-r--r--include/configs/rk3399_common.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index a36725cc13..db3125e173 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -54,8 +54,6 @@
#define CONFIG_SYS_SDRAM_BASE 0
#define CONFIG_NR_DRAM_BANKS 1
-#define CONFIG_SPI_FLASH
-#define CONFIG_SPI
#define CONFIG_SF_DEFAULT_SPEED 20000000
#ifndef CONFIG_SPL_BUILD