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
Merge remote-tracking branch 'u-boot-imx/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx31pdk.h
diff --git
a/include/configs/mx31pdk.h
b/include/configs/mx31pdk.h
index
4253c3e
..
b272674
100644
(file)
--- a/
include/configs/mx31pdk.h
+++ b/
include/configs/mx31pdk.h
@@
-35,8
+35,6
@@
/* High Level Configuration Options */
#define CONFIG_ARM1136 /* This is an arm1136 CPU core */
#define CONFIG_MX31 /* in a mx31 */
/* High Level Configuration Options */
#define CONFIG_ARM1136 /* This is an arm1136 CPU core */
#define CONFIG_MX31 /* in a mx31 */
-#define CONFIG_MX31_HCLK_FREQ 26000000
-#define CONFIG_MX31_CLK32 32768
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
@@
-61,7
+59,7
@@
*/
#define CONFIG_MXC_UART
*/
#define CONFIG_MXC_UART
-#define CONFIG_
SYS_MX31_UART1
+#define CONFIG_
MXC_UART_BASE UART1_BASE
#define CONFIG_HW_WATCHDOG
#define CONFIG_MXC_GPIO
#define CONFIG_HW_WATCHDOG
#define CONFIG_MXC_GPIO
@@
-85,7
+83,6
@@
#define CONFIG_ENV_OVERWRITE
#define CONFIG_CONS_INDEX 1
#define CONFIG_BAUDRATE 115200
#define CONFIG_ENV_OVERWRITE
#define CONFIG_CONS_INDEX 1
#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200}
/***********************************************************
* Command definition
/***********************************************************
* Command definition
@@
-99,6
+96,7
@@
#define CONFIG_CMD_SPI
#define CONFIG_CMD_DATE
#define CONFIG_CMD_NAND
#define CONFIG_CMD_SPI
#define CONFIG_CMD_DATE
#define CONFIG_CMD_NAND
+#define CONFIG_CMD_BOOTZ
/*
* Disabled due to compilation errors in cmd_bootm.c (IMLS seems to require
/*
* Disabled due to compilation errors in cmd_bootm.c (IMLS seems to require
@@
-141,7
+139,7
@@
/* memtest works on */
#define CONFIG_SYS_MEMTEST_START 0x80000000
/* memtest works on */
#define CONFIG_SYS_MEMTEST_START 0x80000000
-#define CONFIG_SYS_MEMTEST_END 0x10000
+#define CONFIG_SYS_MEMTEST_END 0x
800
10000
/* default load address */
#define CONFIG_SYS_LOAD_ADDR 0x81000000
/* default load address */
#define CONFIG_SYS_LOAD_ADDR 0x81000000
@@
-151,13
+149,6
@@
#define CONFIG_CMDLINE_EDITING
/*-----------------------------------------------------------------------
#define CONFIG_CMDLINE_EDITING
/*-----------------------------------------------------------------------
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */
-
-/*-----------------------------------------------------------------------
* Physical Memory Map
*/
#define CONFIG_NR_DRAM_BANKS 1
* Physical Memory Map
*/
#define CONFIG_NR_DRAM_BANKS 1