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

diff --git a/board/karo/tx28/config.mk b/board/karo/tx28/config.mk
index a1aa917..0d3b1fd 100644 (file)
--- a/board/karo/tx28/config.mk
+++ b/board/karo/tx28/config.mk
@@ -7,6 +7,7 @@ __HAVE_ARCH_GENERIC_BOARD := y
 LOGO_BMP = logos/karo.bmp
 
 PLATFORM_CPPFLAGS += -Werror
 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
 endif
 ifneq ($(CONFIG_SPL_BUILD),y)
        ALL-y += $(obj)/u-boot.sb
 endif