ARM: mxs: spl_power_init: fix merge error leading to "redefinition of 'mxs_init_batt_...

[karo-tx-uboot.git] / board / karo / tx28 / config.mk

diff --git a/board/karo/tx28/config.mk b/board/karo/tx28/config.mk
index c3beb5d27a995d9927084ee589d33bf2236c0e29..0d3b1fd2202ea9f33b924d8232243834591a9dd9 100644 (file)
--- a/board/karo/tx28/config.mk
+++ b/board/karo/tx28/config.mk
@@ -2,11 +2,14 @@
 CONFIG_SYS_TEXT_BASE := 0x40100000
 CONFIG_SPL_TEXT_BASE := 0x00000000
 
+__HAVE_ARCH_GENERIC_BOARD := y
+
 LOGO_BMP = logos/karo.bmp
 
 PLATFORM_CPPFLAGS += -Werror
+PLATFORM_CPPFLAGS += -DCONFIG_SPL_TEXT_BASE=$(CONFIG_SPL_TEXT_BASE)
 ifneq ($(CONFIG_SPL_BUILD),y)
-       ALL-y += $(obj)u-boot.sb
+       ALL-y += $(obj)/u-boot.sb
 endif
 
 CONFIG_SYS_NAND_BLOCK_SIZE := 131072