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 'master' into next
[platform/kernel/u-boot.git]
/
include
/
configs
/
mv-common.h
diff --git
a/include/configs/mv-common.h
b/include/configs/mv-common.h
index
e460f69
..
3dfcb13
100644
(file)
--- a/
include/configs/mv-common.h
+++ b/
include/configs/mv-common.h
@@
-23,24
+23,22
@@
*/
/*
*/
/*
- * Custom CONFIG_
SYS_
TEXT_BASE can be done in <board>.h
+ * Custom CONFIG_TEXT_BASE can be done in <board>.h
*/
/* additions for new ARM relocation support */
*/
/* additions for new ARM relocation support */
-#define C
ONFIG_SYS_SDRAM_BASE
0x00000000
+#define C
FG_SYS_SDRAM_BASE
0x00000000
/*
* NS16550 Configuration
*/
/*
* NS16550 Configuration
*/
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_CLK CONFIG_SYS_TCLK
-#if !defined(CONFIG_DM_SERIAL)
-#define CONFIG_SYS_NS16550_REG_SIZE (-4)
-#define CONFIG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE
+#define CFG_SYS_NS16550_CLK CFG_SYS_TCLK
+#if !CONFIG_IS_ENABLED(DM_SERIAL)
+#define CFG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE
#endif
#endif
-#if defined(CONFIG_ARMADA_38X) && !defined(C
ONFI
G_SYS_BAUDRATE_TABLE)
-#define C
ONFIG_SYS_BAUDRATE_TABLE
{ 300, 600, 1200, 1800, 2400, 4800, \
+#if defined(CONFIG_ARMADA_38X) && !defined(C
F
G_SYS_BAUDRATE_TABLE)
+#define C
FG_SYS_BAUDRATE_TABLE
{ 300, 600, 1200, 1800, 2400, 4800, \
9600, 19200, 38400, 57600, 115200, \
230400, 460800, 500000, 576000, \
921600, 1000000, 1152000, 1500000, \
9600, 19200, 38400, 57600, 115200, \
230400, 460800, 500000, 576000, \
921600, 1000000, 1152000, 1500000, \
@@
-50,13
+48,9
@@
/* auto boot */
/* auto boot */
-#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buff Size */
-
/*
* Other required minimal configurations
*/
/*
* Other required minimal configurations
*/
-#define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */
-#define CONFIG_SYS_MAXARGS 32 /* max number of command args */
/* ====> Include platform Common Definitions */
#include <asm/arch/config.h>
/* ====> Include platform Common Definitions */
#include <asm/arch/config.h>
@@
-65,8
+59,5
@@
/*
* Common NAND configuration
*/
/*
* Common NAND configuration
*/
-#ifdef CONFIG_CMD_NAND
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
-#endif
#endif /* _MV_COMMON_H */
#endif /* _MV_COMMON_H */