Merge branch 'master' of git://git.denx.de/u-boot-imx

[u-boot] / include / configs / mx7_common.h

diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index ea2be496e05c7d1da924aaecd5c5ca3cfd85bdd9..fac7c3f2e22909079809e4ec7a25bac6961a9457 100644 (file)
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -21,6 +21,9 @@
 #define CONFIG_MXC_GPT_HCLK
 #define CONFIG_SYSCOUNTER_TIMER
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
+#define CONFIG_SYS_FSL_CLK
+
+#define CONFIG_SYS_BOOTM_LEN   0x1000000
 
 /* Enable iomux-lpsr support */
 #define CONFIG_IOMUX_LPSR
@@ -32,11 +35,11 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
 
-#define CONFIG_ROM_UNIFIED_SECTIONS
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
+#define CONFIG_FSL_CLK
+
 #define CONFIG_LOADADDR                 0x80800000
 #define CONFIG_SYS_TEXT_BASE            0x87800000
 
@@ -74,7 +77,6 @@
 
 /* GPIO */
 #define CONFIG_MXC_GPIO
-#define CONFIG_CMD_GPIO
 
 /* UART */
 #define CONFIG_MXC_UART
@@ -92,4 +94,15 @@
 #define CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP
 
+/*
+ * Default boot linux kernel in no secure mode.
+ * If want to boot kernel in secure mode, please define CONFIG_MX7_SEC
+ */
+#ifndef CONFIG_MX7_SEC
+#define CONFIG_ARMV7_NONSEC
+#define CONFIG_ARMV7_PSCI
+#define CONFIG_ARMV7_PSCI_NR_CPUS      2
+#define CONFIG_ARMV7_SECURE_BASE       0x00900000
+#endif
+
 #endif