[U-Boot] [PATCH v2 2/2] MX28: Move "regs-base.h" include after SoC type configuration

Stefano Babic
2012-08-20T08:02:01Z

On 18/08/2012 19:25, Otavio Salvador wrote:
> For i.MX233 addition the base registers need to be change so the SoC
> definition needs to be known before the header include.
>
> The following boards has been changed:
>
> * apx4devkit
> * m28evk
> * mx28evk
> * sc_sps_1
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> Acked-by: Stefano Babic <sbabic@denx.de>
> ---
> Changes in v2:
> - no changes
>
> include/configs/apx4devkit.h | 4 ++--
> include/configs/m28evk.h | 4 ++--
> include/configs/mx28evk.h | 5 +++--
> include/configs/sc_sps_1.h | 4 ++--
> 4 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
> index b5ae44f..af0b714 100644
> --- a/include/configs/apx4devkit.h
> +++ b/include/configs/apx4devkit.h
> @@ -22,8 +22,6 @@
> #ifndef __CONFIG_H
> #define __CONFIG_H
>
> -#include <asm/arch/regs-base.h>
> -
> /* SoC configurations */
> #define CONFIG_MX28 /* i.MX28 SoC */
> #define CONFIG_MXS_GPIO /* GPIO control */
> @@ -32,6 +30,8 @@
> #define MACH_TYPE_APX4DEVKIT 3712
> #define CONFIG_MACH_TYPE MACH_TYPE_APX4DEVKIT
>
> +#include <asm/arch/regs-base.h>
> +
> #define CONFIG_SYS_NO_FLASH
> #define CONFIG_BOARD_EARLY_INIT_F
> #define CONFIG_ARCH_CPU_INIT
> diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
> index b3ac316..91c6bb9 100644
> --- a/include/configs/m28evk.h
> +++ b/include/configs/m28evk.h
> @@ -20,8 +20,6 @@
> #ifndef __M28EVK_CONFIG_H__
> #define __M28EVK_CONFIG_H__
>
> -#include <asm/arch/regs-base.h>
> -
> /*
> * SoC configurations
> */
> @@ -36,6 +34,8 @@
>
> #define CONFIG_MACH_TYPE MACH_TYPE_M28EVK
>
> +#include <asm/arch/regs-base.h>
> +
> #define CONFIG_SYS_NO_FLASH
> #define CONFIG_BOARD_EARLY_INIT_F
> #define CONFIG_ARCH_MISC_INIT
> diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
> index 4e70617..ac06caf 100644
> --- a/include/configs/mx28evk.h
> +++ b/include/configs/mx28evk.h
> @@ -19,17 +19,18 @@
> #ifndef __MX28EVK_CONFIG_H__
> #define __MX28EVK_CONFIG_H__
>
> -#include <asm/arch/regs-base.h>
> -
> /*
> * SoC configurations
> */
> #define CONFIG_MX28 /* i.MX28 SoC */
> +
> #define CONFIG_MXS_GPIO /* GPIO control */
> #define CONFIG_SYS_HZ 1000 /* Ticks per second */
>
> #define CONFIG_MACH_TYPE MACH_TYPE_MX28EVK
>
> +#include <asm/arch/regs-base.h>
> +
> #define CONFIG_SYS_NO_FLASH
> #define CONFIG_BOARD_EARLY_INIT_F
> #define CONFIG_ARCH_MISC_INIT
> diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h
> index f0b6f2b..0ebdfb8 100644
> --- a/include/configs/sc_sps_1.h
> +++ b/include/configs/sc_sps_1.h
> @@ -22,8 +22,6 @@
> #ifndef __SC_SPS_1_H__
> #define __SC_SPS_1_H__
>
> -#include <asm/arch/regs-base.h>
> -
> /*
> * SoC configurations
> */
> @@ -38,6 +36,8 @@
>
> #define CONFIG_MACH_TYPE MACH_TYPE_SC_SPS_1
>
> +#include <asm/arch/regs-base.h>
> +
> #define CONFIG_SYS_NO_FLASH
> #define CONFIG_SYS_ICACHE_OFF
> #define CONFIG_SYS_DCACHE_OFF
>
Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================