From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Fri, 21 Aug 2015 14:44:39 +0000 (+0200)
Subject: ARM: mxs: spl_power_init: fix merge error leading to "redefinition of 'mxs_init_batt_... 
X-Git-Tag: KARO-TX6-2015-09-18~4034^2~1^2~11
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=0880f0a6407d4d16a281d52875061872c60991db;ds=sidebyside

ARM: mxs: spl_power_init: fix merge error leading to "redefinition of 'mxs_init_batt_bo'" error
---

diff --git a/board/karo/tx28/config.mk b/board/karo/tx28/config.mk
index a1aa917185..0d3b1fd220 100644
--- 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
+PLATFORM_CPPFLAGS += -DCONFIG_SPL_TEXT_BASE=$(CONFIG_SPL_TEXT_BASE)
 ifneq ($(CONFIG_SPL_BUILD),y)
 	ALL-y += $(obj)/u-boot.sb
 endif