Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig

[people/ms/u-boot.git] / include / configs / mx6_common.h

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index 1a8ab4ee33e1d7e29584f830f6848799f0efe942..2dc10c6d646670bef9f0a375eb632079662a2a57 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -7,7 +7,10 @@
 #ifndef __MX6_COMMON_H
 #define __MX6_COMMON_H
 
-#ifndef CONFIG_MX6UL
+#if (defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL))
+#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
+#define COUNTER_FREQUENCY CONFIG_SC_TIMER_CLK
+#else
 #ifndef CONFIG_SYS_L2CACHE_OFF
 #define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE  L2_PL310_BASE
@@ -22,7 +25,7 @@
 
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #ifndef CONFIG_MX6
 #define CONFIG_MX6
@@ -37,17 +40,12 @@
 #define CONFIG_REVISION_TAG
 
 /* Boot options */
-#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL) || \
-       defined(CONFIG_MX6UL) || defined(CONFIG_MX6SLL))
+#if defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL) || \
+       defined(CONFIG_MX6SX) || \
+       defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
 #define CONFIG_LOADADDR                0x82000000
-#ifndef CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_TEXT_BASE   0x87800000
-#endif
 #else
 #define CONFIG_LOADADDR                0x12000000
-#ifndef CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_TEXT_BASE   0x17800000
-#endif
 #endif
 #define CONFIG_SYS_LOAD_ADDR   CONFIG_LOADADDR
 
@@ -56,21 +54,10 @@
 #define CONFIG_CONS_INDEX       1
 
 /* Filesystems and image support */
-#define CONFIG_SUPPORT_RAW_INITRD
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE      512
 #define CONFIG_SYS_MAXARGS     32
-#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
-
-#ifndef CONFIG_SYS_DCACHE_OFF
-#endif
-
-/* GPIO */
-#define CONFIG_MXC_GPIO
 
 /* MMC */
 #define CONFIG_BOUNCE_BUFFER