projects
/
oweals
/
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
[oweals/u-boot.git]
/
include
/
configs
/
usbarmory.h
diff --git
a/include/configs/usbarmory.h
b/include/configs/usbarmory.h
index 95e232429f714d44eba4ecb23f32c297b88ecab2..492aeb4ca3c8d0398a3c9048290c69a4986fbdd9 100644
(file)
--- a/
include/configs/usbarmory.h
+++ b/
include/configs/usbarmory.h
@@
-12,12
+12,9
@@
#define __CONFIG_H
#define CONFIG_SYS_FSL_CLK
#define __CONFIG_H
#define CONFIG_SYS_FSL_CLK
-#define CONFIG_MXC_GPIO
#include <asm/arch/imx-regs.h>
#include <asm/arch/imx-regs.h>
-#include <config_distro_defaults.h>
-
/* U-Boot environment */
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_ENV_SIZE (8 * 1024)
/* U-Boot environment */
#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
#define CONFIG_ENV_SIZE (8 * 1024)
@@
-25,14
+22,10
@@
/* U-Boot general configurations */
#define CONFIG_SYS_CBSIZE 512
/* U-Boot general configurations */
#define CONFIG_SYS_CBSIZE 512
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
-#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/* UART */
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
/* UART */
#define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE
-#define CONFIG_CONS_INDEX 1
/* SD/MMC */
#define CONFIG_FSL_ESDHC
/* SD/MMC */
#define CONFIG_FSL_ESDHC
@@
-56,7
+49,6
@@
/* U-Boot memory offsets */
#define CONFIG_LOADADDR 0x72000000
/* U-Boot memory offsets */
#define CONFIG_LOADADDR 0x72000000
-#define CONFIG_SYS_TEXT_BASE 0x77800000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Linux boot */
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
/* Linux boot */