summaryrefslogtreecommitdiff
path: root/include/configs/mxs.h
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2014-08-11 10:21:03 +0200
committerStefano Babic <sbabic@denx.de>2014-08-11 10:21:03 +0200
commite82abaeb7f2a0833fccf90460c48b9f2100258f8 (patch)
treede701f5c90b7373966412d566b5c00d3837954bc /include/configs/mxs.h
parentf93f21906e374d46c6abfbdf4eb9cb1ab51b6384 (diff)
parent1899fac925eda817e12234aef3d01d354788662e (diff)
downloadu-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.zip
u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.gz
u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts: boards.cfg Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'include/configs/mxs.h')
-rw-r--r--include/configs/mxs.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index df9eb93..eb96fc1 100644
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -50,7 +50,6 @@
#define CONFIG_ARCH_MISC_INIT
/* SPL */
-#define CONFIG_SPL
#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/arm926ejs/mxs"
#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"