[U-Boot] [RFC v0 08/11] omap3: Consolidate UART information in omap3_common.h

Unless a board defines CONFIG_SERIAL_MULTI we assume it is using an on-module UART somewhere. We leave the exact configuration per-board.

Start an environment section in omap3_common.h and default to allowing the environment to override console/ethaddr. omap3_mvblx retains its behavior via opt-out.

We also remove CONFIG_SERIAL[123] as these aren't meaningful for the ns16550 driver.

Signed-off-by: Tom Rini trini@ti.com --- include/configs/am3517_crane.h | 21 ++------------------- include/configs/am3517_evm.h | 20 +------------------- include/configs/cm_t35.h | 20 +------------------- include/configs/devkit8000.h | 13 +------------ include/configs/dig297.h | 21 ++------------------- include/configs/igep00x0.h | 20 ++------------------ include/configs/mcx.h | 20 +------------------- include/configs/omap3_beagle.h | 21 ++------------------- include/configs/omap3_common.h | 18 ++++++++++++++++++ include/configs/omap3_evm.h | 3 --- include/configs/omap3_evm_common.h | 17 +---------------- include/configs/omap3_logic.h | 21 ++------------------- include/configs/omap3_mvblx.h | 23 +++++------------------ include/configs/omap3_overo.h | 21 ++------------------- include/configs/omap3_pandora.h | 21 ++------------------- include/configs/omap3_sdp3430.h | 21 ++------------------- include/configs/omap3_zoom1.h | 21 ++------------------- include/configs/omap3_zoom2.h | 13 +++---------- include/configs/tam3517-common.h | 18 +----------------- include/configs/tricorder.h | 13 +------------ 20 files changed, 51 insertions(+), 315 deletions(-)

diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index ab776a7..0c46af4 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -51,28 +51,11 @@ * Hardware drivers */

-/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration - */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 /* UART3 on CRANEBOARD */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} + #define CONFIG_GENERIC_MMC 1 #define CONFIG_MMC 1 #define CONFIG_OMAP_HSMMC 1 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 7b8ba00..639e865 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -51,28 +51,10 @@ * Hardware drivers */

-/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration - */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 /* UART3 on AM3517 EVM */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} #define CONFIG_MMC 1 #define CONFIG_GENERIC_MMC 1 #define CONFIG_OMAP_HSMMC 1 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 0ead8b7..9327524 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -64,28 +64,10 @@ * Hardware drivers */

-/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration - */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 /* UART3 */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}

#define CONFIG_GENERIC_MMC #define CONFIG_MMC diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 13136ea..af03dcf 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -67,19 +67,10 @@ #define CONFIG_DM9000_NO_SROM 1 #undef CONFIG_DM9000_DEBUG

-/* NS16550 Configuration */ -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -/* select serial console configuration */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}

/* MMC */ #define CONFIG_GENERIC_MMC 1 @@ -159,8 +150,6 @@ #undef CONFIG_BOOTP_VENDOREX

/* Environment information */ -#define CONFIG_ENV_OVERWRITE /* allow to overwrite serial and ethaddr */ - #define CONFIG_BOOTDELAY 3

#define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 1923809..808eab2 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -62,28 +62,11 @@ * Hardware drivers */

-/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration: UART3 (ttyO2) - */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} + #define CONFIG_GENERIC_MMC 1 #define CONFIG_MMC 1 #define CONFIG_OMAP_HSMMC 1 diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index 00c38b4..7e955f2 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -39,27 +39,11 @@ * Other configuration options */

-/* - * NS16550 Configuration - */ - -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* select serial console configuration */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ - 115200} + #define CONFIG_GENERIC_MMC 1 #define CONFIG_MMC 1 #define CONFIG_OMAP_HSMMC 1 diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 83783c9..5dda673 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -59,28 +59,10 @@ * Hardware drivers */

-/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration - */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 /* UART3 */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} #define CONFIG_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_GENERIC_MMC diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 86dabb7..298b22b 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -49,28 +49,11 @@ * Hardware drivers */

-/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration - */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 /* UART3 on Beagle Rev 2 */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} + #define CONFIG_GENERIC_MMC 1 #define CONFIG_MMC 1 #define CONFIG_OMAP_HSMMC 1 diff --git a/include/configs/omap3_common.h b/include/configs/omap3_common.h index 1190ce8..82ecce8 100644 --- a/include/configs/omap3_common.h +++ b/include/configs/omap3_common.h @@ -76,4 +76,22 @@ #define CONFIG_SYS_MALLOC_LEN (1024 << 10) #endif

+/* + * Default serial port configuration is an NS16550-compatible UART. + * Boards can override this as needed with CONFIG_SERIAL_MULTI + */ +#ifndef CONFIG_SERIAL_MULTI +#define CONFIG_SYS_NS16550 +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE (-4) +#define CONFIG_SYS_NS16550_CLK 48000000 +#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ + 115200} +#endif + +/* + * Environmnet + */ +#define CONFIG_ENV_OVERWRITE /* Allow to overwrite serial and ethaddr */ + #endif /* __CONFIG_OMAP3_COMMON_H */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 65655bb..eba20b4 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -61,9 +61,6 @@ #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER

-/* Allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - /* Add auto-completion support */ #define CONFIG_AUTO_COMPLETE

diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h index d7fdd44..8ee5e83 100644 --- a/include/configs/omap3_evm_common.h +++ b/include/configs/omap3_evm_common.h @@ -72,25 +72,10 @@ * ----------------------------------------------------------------------------- */

-/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration - */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 1 -#define CONFIG_SERIAL1 1 /* UART1 on OMAP3 EVM */ #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}

/* * I2C diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 77681e9..61c3646 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -53,28 +53,11 @@ * Hardware drivers */

-/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration - */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 -#define CONFIG_SERIAL1 1 /* UART1 on OMAP Logic boards */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} + #define CONFIG_GENERIC_MMC #define CONFIG_MMC #define CONFIG_OMAP_HSMMC diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index 56ed3a1..c980dc3 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -44,6 +44,9 @@ * Override the common platform file choices. */

+/* disallow overwriting serial# and ethaddr */ +#undef CONFIG_ENV_OVERWRITE + /* * Other configuration options */ @@ -57,26 +60,11 @@ * Hardware drivers */

-/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration - */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 /* UART3 */ - #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} + #define CONFIG_GENERIC_MMC 1 #define CONFIG_MMC 1 #define CONFIG_OMAP_HSMMC 1 @@ -133,7 +121,6 @@ #define CONFIG_TWL4030_POWER 1

/* Environment information */ -#undef CONFIG_ENV_OVERWRITE /* disallow overwriting serial# and ethaddr */ #define CONFIG_BOOTDELAY 3

#define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index fdb3bba..a794b2c 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -40,28 +40,11 @@ * Hardware drivers */

-/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration - */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ - 115200} + #define CONFIG_GENERIC_MMC #define CONFIG_MMC #define CONFIG_OMAP_HSMMC diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index d9f4f27..6191b76 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -56,28 +56,11 @@ #define CONFIG_USB_DEVICE 1 #define CONFIG_USB_TTY 1

-/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration - */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ - 115200} + #define CONFIG_GENERIC_MMC 1 #define CONFIG_MMC 1 #define CONFIG_OMAP_HSMMC 1 diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index 4656690..87e3460 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -69,16 +69,7 @@ #define CONFIG_TWL4030_POWER 1

/* - * serial port - NS16550 compatible - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* Original SDP u-boot used UART1 and thus J8 (innermost); that can be + * Original SDP u-boot used UART1 and thus J8 (innermost); that can be * swapped with UART2 via jumpering. Downsides of using J8: it doesn't * support UART boot (that's only for UART3); it prevents sharing a Linux * kernel (LL_DEBUG_UART3) or filesystem (getty ttyS2) with most boards. @@ -88,22 +79,17 @@ * since UART3 isn't in the CORE power domain, it may be a bit less * usable in certain PM-sensitive debug scenarios. */ +#define CONFIG_BAUDRATE 115200 #undef CONSOLE_J9 /* else J8/UART1 (innermost) */

#ifdef CONSOLE_J9 #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 /* UART3 */ #else #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 -#define CONFIG_SERIAL1 1 /* UART1 */ #endif

-#define CONFIG_ENV_OVERWRITE -#define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}

/* * I2C for power management setup @@ -196,9 +182,6 @@ * Network booting environment must be configured at site. */

-/* allow overwriting serial config and ethaddr */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ "console=ttyS0,115200n8\0" \ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 90f37af..e8927a1 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -50,28 +50,11 @@ * Hardware drivers */

-/* - * NS16550 Configuration - */ -#define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK - -/* - * select serial console configuration - */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 /* UART3 */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} + #define CONFIG_GENERIC_MMC 1 #define CONFIG_MMC 1 #define CONFIG_OMAP_HSMMC 1 diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h index c563c5b..fa895d5 100644 --- a/include/configs/omap3_zoom2.h +++ b/include/configs/omap3_zoom2.h @@ -34,6 +34,7 @@ * Values that differ from platform defaults or are unspecified. */ #define CONFIG_SDRC /* The chip has SDRC controller */ +#define CONFIG_SERIAL_MULTI

/* Platform defaults */ #include <configs/omap3_common.h> @@ -54,30 +55,22 @@ /* * NS16550 Configuration * Zoom2 uses the TL16CP754C on the debug board - */ -#define CONFIG_SERIAL_MULTI 1 -/* + * * 0 - 1 : first USB with respect to the left edge of the debug board * 2 - 3 : second USB with respect to the left edge of the debug board */ #define ZOOM2_DEFAULT_SERIAL_DEVICE (&zoom2_serial_device0)

-#define V_NS16550_CLK (1843200) /* 1.8432 Mhz */ - #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_REG_SIZE (-2) -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK +#define CONFIG_SYS_NS16550_CLK (1843200) /* 1.8432 Mhz */ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {115200}

-/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE - #define CONFIG_GENERIC_MMC 1 #define CONFIG_MMC 1 #define CONFIG_OMAP_HSMMC 1 #define CONFIG_DOS_PARTITION 1 - /* Status LED */ #define CONFIG_STATUS_LED 1 /* Status LED enabled */ #define CONFIG_BOARD_SPECIFIC_LED 1 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index f2edbf1..d2ffc29 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -52,26 +52,10 @@ * Hardware drivers */

-/* - * NS16550 Configuration - */ -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -/* - * select serial console configuration - */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 -#define CONFIG_SERIAL1 /* UART1 */ - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} #define CONFIG_MMC #define CONFIG_OMAP_HSMMC #define CONFIG_GENERIC_MMC diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index 1bd8b5c..ee60b13 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -59,19 +59,11 @@

/* Hardware drivers */

-/* NS16550 Configuration */ -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */

-/* select serial console configuration */ +/* Select serial console configuration. */ #define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 #define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200}

/* MMC */ #define CONFIG_GENERIC_MMC @@ -136,9 +128,6 @@ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_MTD_PARTITIONS

-/* Environment information */ -#define CONFIG_ENV_OVERWRITE /* allow to overwrite serial and ethaddr */ - #define CONFIG_BOOTDELAY 3

#define CONFIG_EXTRA_ENV_SETTINGS \