[U-Boot] [PATCH v4 1/5] ARM:AM33XX: Replace CONFIG_AM335X with CONFIG_AM33XX

[Thomas Weber]

Hello Chandan,

On 10.01.2012 07:38, Chandan Nath wrote:
> This patch is added to replace CONFIG_AM335X symbol
> with CONFIG_AM333XX for AM33XX platforms.
> 
One 3 in CONFIG_AM333XX too much, but only in description.
It runs on the Beaglebone.
Tested-by: Thomas Weber <weber at corscience.de>

Thanks.
Thomas

> Signed-off-by: Chandan Nath <chandan.nath at ti.com>
> Signed-off-by: Tom Rini <trini at ti.com>
> ---
> Changes since v3:
>  - Splitted 1st patch into 3 patches
>  - Addressed review comments
> 
> Changes since v2:
>  - No change
> 
> Changes since v1:
>  - Changed CONFIG_AM335X to CONFIG_AM33XX
>  - Rebased to master branch
> 
>  Makefile                               |    2 +-
>  arch/arm/include/asm/arch-am33xx/cpu.h |    2 +-
>  include/configs/am335x_evm.h           |    2 +-
>  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