summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandan Nath <chandan.nath@ti.com>2012-01-09 20:38:55 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-01-16 08:40:11 +0100
commitf16da7466fc46109ba8922069cef521eb068f9a2 (patch)
tree20637af85db33d4d8478dcc210eda42f505a07d0
parente4e2bf5e4ccbe85f2fcfbb2880348228e81eb44e (diff)
downloadu-boot-imx-f16da7466fc46109ba8922069cef521eb068f9a2.zip
u-boot-imx-f16da7466fc46109ba8922069cef521eb068f9a2.tar.gz
u-boot-imx-f16da7466fc46109ba8922069cef521eb068f9a2.tar.bz2
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>
-rw-r--r--Makefile2
-rw-r--r--arch/arm/include/asm/arch-am33xx/cpu.h2
-rw-r--r--include/configs/am335x_evm.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7e9491d..36246b6 100644
--- 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 ad9156e..d18750a 100644
--- 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 26a3c96..f737094 100644
--- 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