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 branch 'u-boot-ti/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx31ads.h
diff --git
a/include/configs/mx31ads.h
b/include/configs/mx31ads.h
index
87638a4
..
9e4006b
100644
(file)
--- a/
include/configs/mx31ads.h
+++ b/
include/configs/mx31ads.h
@@
-27,8
+27,6
@@
/* High Level Configuration Options */
#define CONFIG_ARM1136 1 /* This is an arm1136 CPU core */
#define CONFIG_MX31 1 /* in a mx31 */
/* High Level Configuration Options */
#define CONFIG_ARM1136 1 /* This is an arm1136 CPU core */
#define CONFIG_MX31 1 /* in a mx31 */
-#define CONFIG_MX31_HCLK_FREQ 26000000 /* RedBoot says 26MHz */
-#define CONFIG_MX31_CLK32 32768
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
@@
-70,9
+68,9
@@
#define CONFIG_MXC_GPIO
/* PMIC Controller */
#define CONFIG_MXC_GPIO
/* PMIC Controller */
-#define CONFIG_P
MIC
-#define CONFIG_P
MIC
_SPI
-#define CONFIG_P
MIC
_FSL
+#define CONFIG_P
OWER
+#define CONFIG_P
OWER
_SPI
+#define CONFIG_P
OWER
_FSL
#define CONFIG_FSL_PMIC_BUS 1
#define CONFIG_FSL_PMIC_CS 0
#define CONFIG_FSL_PMIC_CLK 1000000
#define CONFIG_FSL_PMIC_BUS 1
#define CONFIG_FSL_PMIC_CS 0
#define CONFIG_FSL_PMIC_CLK 1000000
@@
-84,7
+82,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
@@
-156,13
+153,6
@@
#define CONFIG_CMDLINE_EDITING 1
/*-----------------------------------------------------------------------
#define CONFIG_CMDLINE_EDITING 1
/*-----------------------------------------------------------------------
- * 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