From 0880f0a6407d4d16a281d52875061872c60991db Mon Sep 17 00:00:00 2001
From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= <LW@KARO-electronics.de>
Date: Fri, 21 Aug 2015 16:44:39 +0200
Subject: [PATCH] ARM: mxs: spl_power_init: fix merge error leading to
 "redefinition of 'mxs_init_batt_bo'" error

---
 board/karo/tx28/config.mk | 1 +
 1 file changed, 1 insertion(+)

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
-- 
2.39.2