projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
m68k: Drop CONFIG_MCFPIT support
[oweals/u-boot.git]
/
include
/
configs
/
ti_omap3_common.h
diff --git
a/include/configs/ti_omap3_common.h
b/include/configs/ti_omap3_common.h
index 6d16fc782bd2b8a342c84f6b2286ef6568ca07d2..3d7cb175faa6b2892da19c8c9b2490b31639e64b 100644
(file)
--- a/
include/configs/ti_omap3_common.h
+++ b/
include/configs/ti_omap3_common.h
@@
-27,12
+27,10
@@
/* NS16550 Configuration */
#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
/* NS16550 Configuration */
#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */
#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK
-#if defined(CONFIG_SPL_BUILD)
-#define CONFIG_SYS_NS16550_SERIAL
#if !defined(CONFIG_DM_SERIAL)
#if !defined(CONFIG_DM_SERIAL)
+#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
#endif /* !CONFIG_DM_SERIAL */
#define CONFIG_SYS_NS16550_REG_SIZE (-4)
#endif /* !CONFIG_DM_SERIAL */
-#endif /* CONFIG_SPL_BUILD */
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \
115200}
#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \
115200}
@@
-41,7
+39,6
@@
#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
#define CONFIG_SYS_NS16550_COM2 OMAP34XX_UART2
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
#define CONFIG_SYS_NS16550_COM2 OMAP34XX_UART2
#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3
-#define CONFIG_SERIAL3 3
#endif
/* Physical Memory Map */
#endif
/* Physical Memory Map */
@@
-58,11
+55,10
@@
#define CONFIG_SYS_MONITOR_LEN (256 << 10)
/* SPL */
#define CONFIG_SYS_MONITOR_LEN (256 << 10)
/* SPL */
-#define CONFIG_SPL_TEXT_BASE 0x40200800
#define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \
(64 << 20))
#define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \
(64 << 20))
-#ifdef CONFIG_NAND
+#ifdef CONFIG_
MTD_RAW_
NAND
#define CONFIG_SYS_NAND_BASE 0x30000000
#endif
#define CONFIG_SYS_NAND_BASE 0x30000000
#endif