| Message ID | 20170326190955.5800-1-heiko@sntech.de |
|---|---|
| State | Accepted |
| Commit | 3af803a5026bacb2cfc53b307bd8ead12a46c9a0 |
| Delegated to: | Simon Glass |
| Headers | show |
On 26 March 2017 at 13:09, Heiko Stuebner <heiko@sntech.de> wrote: > Commit 3a649407a49b ("arm: Migrate SYS_THUMB_BUILD to Kconfig, introduce > SPL_SYS_THUMB_BUILD") moved the THUMB_BUILD symbols from the header to > Kconfig symbols. With it still defined in the rk3188 header we end up > with a duplicate symbol and compile errors, so fix that. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > include/configs/rk3188_common.h | 1 - > 1 file changed, 1 deletion(-) Acked-by: Simon Glass <sjg@chromium.org>
On 31 March 2017 at 22:22, Simon Glass <sjg@chromium.org> wrote: > On 26 March 2017 at 13:09, Heiko Stuebner <heiko@sntech.de> wrote: >> Commit 3a649407a49b ("arm: Migrate SYS_THUMB_BUILD to Kconfig, introduce >> SPL_SYS_THUMB_BUILD") moved the THUMB_BUILD symbols from the header to >> Kconfig symbols. With it still defined in the rk3188 header we end up >> with a duplicate symbol and compile errors, so fix that. >> >> Signed-off-by: Heiko Stuebner <heiko@sntech.de> >> --- >> include/configs/rk3188_common.h | 1 - >> 1 file changed, 1 deletion(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-rockchip, thanks!
diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index d7e96ec269..c5e508e4ab 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -18,7 +18,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_MALLOC_LEN (32 << 20) #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_TIMER_RATE (24 * 1000 * 1000) #define CONFIG_SYS_TIMER_BASE 0x2000e000 /* TIMER3 */
Commit 3a649407a49b ("arm: Migrate SYS_THUMB_BUILD to Kconfig, introduce SPL_SYS_THUMB_BUILD") moved the THUMB_BUILD symbols from the header to Kconfig symbols. With it still defined in the rk3188 header we end up with a duplicate symbol and compile errors, so fix that. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- include/configs/rk3188_common.h | 1 - 1 file changed, 1 deletion(-)