| Message ID | 1490787091-21008-6-git-send-email-philipp.tomsich@theobroma-systems.com |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 29 March 2017 at 05:31, Philipp Tomsich <philipp.tomsich@theobroma-systems.com> wrote: > From: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com> > > 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> > --- > > Changes in v2: None > > include/configs/rk3399_common.h | 2 -- > 1 file changed, 2 deletions(-) Acked-by: Simon Glass <sjg@chromium.org>
On 31 March 2017 at 22:23, Simon Glass <sjg@chromium.org> wrote: > On 29 March 2017 at 05:31, Philipp Tomsich > <philipp.tomsich@theobroma-systems.com> wrote: >> From: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com> >> >> 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> >> --- >> >> Changes in v2: None >> >> include/configs/rk3399_common.h | 2 -- >> 1 file changed, 2 deletions(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-rockchip, thanks!
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index a36725c..db3125e 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