ARM: mxs: spl_power_init: fix merge error leading to "redefinition of 'mxs_init_batt_...
authorLothar Waßmann <LW@KARO-electronics.de>
Fri, 21 Aug 2015 14:44:39 +0000 (16:44 +0200)
committerLothar Waßmann <LW@KARO-electronics.de>
Fri, 21 Aug 2015 14:44:39 +0000 (16:44 +0200)
board/karo/tx28/config.mk

index a1aa917..0d3b1fd 100644 (file)
@@ -7,6 +7,7 @@ __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
 endif