projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-video
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
config.h
diff --git
a/arch/arm/include/asm/config.h
b/arch/arm/include/asm/config.h
index 2a20a770bcd38102f3b94d91f318162eaa24683b..435fc4521c2e1198ba49f13d8c5cc743236e0a2b 100644
(file)
--- a/
arch/arm/include/asm/config.h
+++ b/
arch/arm/include/asm/config.h
@@
-7,8
+7,6
@@
#ifndef _ASM_CONFIG_H_
#define _ASM_CONFIG_H_
#ifndef _ASM_CONFIG_H_
#define _ASM_CONFIG_H_
-#define CONFIG_SYS_GENERIC_GLOBAL_DATA
-
#define CONFIG_LMB
#define CONFIG_SYS_BOOT_RAMDISK_HIGH
#define CONFIG_LMB
#define CONFIG_SYS_BOOT_RAMDISK_HIGH
@@
-17,4
+15,12
@@
#define CONFIG_STATIC_RELA
#endif
#define CONFIG_STATIC_RELA
#endif
+#if defined(CONFIG_LS102XA) || \
+ defined(CONFIG_CPU_PXA27X) || \
+ defined(CONFIG_CPU_MONAHANS) || \
+ defined(CONFIG_CPU_PXA25X) || \
+ defined(CONFIG_FSL_LAYERSCAPE)
+#include <asm/arch/config.h>
+#endif
+
#endif
#endif