diff options
| author | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2017-08-03 22:52:04 +0200 |
|---|---|---|
| committer | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2017-08-13 17:12:37 +0200 |
| commit | 96b9082c6413c9ec354f9ea5c61014e2b203ff5b (patch) | |
| tree | 4849225a5d2c24a288d3450135e04f01835e26bd /arch/arm | |
| parent | c72c161bc0af0dc8fdabdebf3812cfeef3915e4c (diff) | |
| download | u-boot-96b9082c6413c9ec354f9ea5c61014e2b203ff5b.tar.gz u-boot-96b9082c6413c9ec354f9ea5c61014e2b203ff5b.tar.bz2 u-boot-96b9082c6413c9ec354f9ea5c61014e2b203ff5b.zip | |
rockchip: rk3188: rock: adjust for SPL/TPL split
With the changes to split SPL/TPL for the RK3368, I apparently missed
some needed adjustments to the RK3188 Kconfig and rock_defconfig.
This fixes build-issues for the rock board after applying the RK3368
enablement (and SPL/TPL) set that resulted from TPL_SERIAL_SUPPORT,
TPL_ROCKCHIP_BACK_TO_BROM and TPL_TINY_MEMSET being separate symbols
now.
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-rockchip/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/rk3188/Kconfig | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile index c3ed862810..79e9704a2c 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -35,7 +35,9 @@ obj-y += rk_timer.o endif obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/ -obj-tpl-$(CONFIG_ROCKCHIP_RK3188) += rk3188/ +ifndef CONFIG_TPL_BUILD +obj-$(CONFIG_ROCKCHIP_RK3188) += rk3188/ +endif obj-$(CONFIG_ROCKCHIP_RK322X) += rk322x/ obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288/ obj-$(CONFIG_ROCKCHIP_RK3328) += rk3328/ diff --git a/arch/arm/mach-rockchip/rk3188/Kconfig b/arch/arm/mach-rockchip/rk3188/Kconfig index d129fcda99..2bb35662d1 100644 --- a/arch/arm/mach-rockchip/rk3188/Kconfig +++ b/arch/arm/mach-rockchip/rk3188/Kconfig @@ -30,9 +30,6 @@ config TPL_LIBCOMMON_SUPPORT config TPL_LIBGENERIC_SUPPORT default y -config TPL_SERIAL_SUPPORT - default y - source "board/radxa/rock/Kconfig" endif |