projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert all of CONFIG_CONS_INDEX to Kconfig
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx7_common.h
diff --git
a/include/configs/mx7_common.h
b/include/configs/mx7_common.h
index
b10b7f1
..
ef76c2f
100644
(file)
--- a/
include/configs/mx7_common.h
+++ b/
include/configs/mx7_common.h
@@
-11,7
+11,7
@@
#include <linux/sizes.h>
#include <asm/arch/imx-regs.h>
#include <linux/sizes.h>
#include <asm/arch/imx-regs.h>
-#include <asm/
imx-common
/gpio.h>
+#include <asm/
mach-imx
/gpio.h>
#ifndef CONFIG_MX7
#define CONFIG_MX7
#ifndef CONFIG_MX7
#define CONFIG_MX7
@@
-19,9
+19,8
@@
/* Timer settings */
#define CONFIG_MXC_GPT_HCLK
/* Timer settings */
#define CONFIG_MXC_GPT_HCLK
-#define CONFIG_SYSCOUNTER_TIMER
#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
#define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
-#define CO
NFIG_TIMER_CLK_FREQ
CONFIG_SC_TIMER_CLK
+#define CO
UNTER_FREQUENCY
CONFIG_SC_TIMER_CLK
#define CONFIG_SYS_FSL_CLK
#define CONFIG_SYS_BOOTM_LEN 0x1000000
#define CONFIG_SYS_FSL_CLK
#define CONFIG_SYS_BOOTM_LEN 0x1000000
@@
-30,27
+29,17
@@
#define CONFIG_IOMUX_LPSR
#define CONFIG_LOADADDR 0x80800000
#define CONFIG_IOMUX_LPSR
#define CONFIG_LOADADDR 0x80800000
-#define CONFIG_SYS_TEXT_BASE 0x87800000
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX 1
-#define CONFIG_BAUDRATE 115200
/* Miscellaneous configurable options */
/* 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_CBSIZE 512
#define CONFIG_SYS_MAXARGS 32
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#ifndef CONFIG_SYS_DCACHE_OFF
#endif
#ifndef CONFIG_SYS_DCACHE_OFF
#endif
-/* GPIO */
-#define CONFIG_MXC_GPIO
-
/* UART */
#define CONFIG_MXC_UART
/* UART */
#define CONFIG_MXC_UART
@@
-60,15
+49,15
@@
#define CONFIG_FSL_USDHC
/* Fuses */
#define CONFIG_FSL_USDHC
/* Fuses */
-#define CONFIG_CMD_FUSE
#define CONFIG_MXC_OCOTP
#define CONFIG_ARMV7_SECURE_BASE 0x00900000
#define CONFIG_MXC_OCOTP
#define CONFIG_ARMV7_SECURE_BASE 0x00900000
+#define CONFIG_ARMV7_PSCI_1_0
+
/* Secure boot (HAB) support */
#ifdef CONFIG_SECURE_BOOT
#define CONFIG_CSF_SIZE 0x2000
/* Secure boot (HAB) support */
#ifdef CONFIG_SECURE_BOOT
#define CONFIG_CSF_SIZE 0x2000
-#define CONFIG_CMD_DEKBLOB
#endif
#endif
#endif
#endif