ARM:AM33XX: Replace CONFIG_AM335X with CONFIG_AM33XX

This patch is added to replace CONFIG_AM335X symbol
with CONFIG_AM333XX for AM33XX platforms.

Signed-off-by: Chandan Nath <chandan.nath@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
Tested-by: Thomas Weber <weber@corscience.de>

diff --git a/Makefile b/Makefile
index 7e9491d3db2b0de44cff08764722bb0c17d3982e..36246b653e2336a84fd64ad9b210dc4037154a88 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -294,7 +294,7 @@ LIBS += lib/libfdt/libfdt.o
 LIBS += api/libapi.o
 LIBS += post/libpost.o
 
-ifneq ($(CONFIG_AM335X)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
+ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
 LIBS += $(CPUDIR)/omap-common/libomap-common.o
 endif
 

diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h
index ad9156eb44df3e5944ffb39775ecff1e65dffd58..d18750adac6fd9f9c6a718daa020ddf9cdae39fb 100644 (file)
--- a/arch/arm/include/asm/arch-am33xx/cpu.h
+++ b/arch/arm/include/asm/arch-am33xx/cpu.h
@@ -51,7 +51,7 @@
                                        | BIT(3) | BIT(4))
 
 /* Reset control */
-#ifdef CONFIG_AM335X
+#ifdef CONFIG_AM33XX
 #define PRM_RSTCTRL                    0x44E00F00
 #endif
 #define PRM_RSTCTRL_RESET              0x01

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 26a3c964ba7697b3c6674abb9f7be804e4a78b05..f73709402200a53cd14aec554f151fab5ab9c17a 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -16,7 +16,7 @@
 #ifndef __CONFIG_AM335X_EVM_H
 #define __CONFIG_AM335X_EVM_H
 
-#define CONFIG_AM335X
+#define CONFIG_AM33XX
 #define CONFIG_CMD_MEMORY      /* for mtest */
 #undef CONFIG_GZIP
 #undef CONFIG_ZLIB