imx: Rename CONFIG_MXS to CFG_MXS

This is not a Kconfig option so we should not be setting it in the
Makefile. Rename it to use a CFS_ prefix, since this is still used in
mxsimage.c

In general tools should support all the features without reference to
CONFIG options, but this is left to the maintainer to look at.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/tools/Makefile b/tools/Makefile
index edfa40903d9e0a1c88297d014d3d0083ce0798ee..2ee43dff542f3fa9d4e8c38633fa0fbac8e43f9c 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -158,9 +158,9 @@ fit_check_sign-objs   := $(dumpimage-mkimage-objs) fit_check_sign.o
 file2include-objs := file2include.o
 
 ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_TOOLS_LIBCRYPTO),)
-# Add CONFIG_MXS into host CFLAGS, so we can check whether or not register
+# Add CFG_MXS into host CFLAGS, so we can check whether or not register
 # the mxsimage support within tools/mxsimage.c .
-HOSTCFLAGS_mxsimage.o += -DCONFIG_MXS
+HOSTCFLAGS_mxsimage.o += -DCFG_MXS
 endif
 
 ifdef CONFIG_TOOLS_LIBCRYPTO

diff --git a/tools/mxsimage.c b/tools/mxsimage.c
index fee022aab46b5bda9f0d001a7f2e29e5f21a8a02..fbe46c47faeeec8730502432e4d593ab90434559 100644 (file)
--- a/tools/mxsimage.c
+++ b/tools/mxsimage.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2012-2013 Marek Vasut <marex@denx.de>
  */
 
-#ifdef CONFIG_MXS
+#ifdef CFG_MXS
 
 #include <errno.h>
 #include <fcntl.h>