MX28: Move "regs-base.h" include after SoC type configuration

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>

diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index b5ae44ffd59a52a8d85ef7cad80e98d03c591f8a..af0b714e11a9099c83e4ff534cb305974a778124 100644 (file)
--- 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 ebf7d600b5e5af5107d6087e1f77675566137f5f..c26b720b9b8532b497fda7343815a402d579f896 100644 (file)
--- 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 fca58939f2ebabe965571fc4a7a49b44512d93ec..f7c9039b846bff9fc4cad90ae9bebdf2ffc38bb1 100644 (file)
--- 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 f0b6f2b006bf18c07105d7aae6e392d54bb4b257..0ebdfb8217da11fb51e47168fb99bb7dc19bc7da 100644 (file)
--- 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