diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2012-08-18 07:25:26 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-01 14:58:27 +0200 |
| commit | e229d445fc986f800cd6b44992dacadc74d535ea (patch) | |
| tree | e42c867a35ad61026e7ea2cf000c95681eb15b5f | |
| parent | a54535551d7f37054c73c79b6f0417e7e244db89 (diff) | |
| download | olio-uboot-2014.01-e229d445fc986f800cd6b44992dacadc74d535ea.tar.xz olio-uboot-2014.01-e229d445fc986f800cd6b44992dacadc74d535ea.zip | |
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>
| -rw-r--r-- | include/configs/apx4devkit.h | 4 | ||||
| -rw-r--r-- | include/configs/m28evk.h | 4 | ||||
| -rw-r--r-- | include/configs/mx28evk.h | 5 | ||||
| -rw-r--r-- | 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 b5ae44ffd..af0b714e1 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 ebf7d600b..c26b720b9 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 fca58939f..f7c9039b8 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 f0b6f2b00..0ebdfb821 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 |