global: Migrate CONFIG_MXC_UART_BASE to CFG

[platform/kernel/u-boot.git] / include / configs / ti_am335x_common.h

diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index 19e1e22..20f8643 100644 (file)
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -11,26 +11,13 @@
 #ifndef __CONFIG_TI_AM335X_COMMON_H__
 #define __CONFIG_TI_AM335X_COMMON_H__
 
-#define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
-#define CONFIG_SYS_TIMERBASE           0x48040000      /* Use Timer2 */
+#define CFG_MAX_RAM_BANK_SIZE  (1024 << 20)    /* 1GB */
+#define CFG_SYS_TIMERBASE              0x48040000      /* Use Timer2 */
 
 #include <asm/arch/omap.h>
 
 /* NS16550 Configuration */
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_NS16550_SERIAL
-#ifndef CONFIG_DM_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
-#endif
-#endif
-#define CONFIG_SYS_NS16550_CLK         48000000
-
-#ifndef CONFIG_SPL_BUILD
-/* Network defines. */
-#define CONFIG_BOOTP_DNS2
-#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_NET_RETRY_COUNT         10
-#endif
+#define CFG_SYS_NS16550_CLK            48000000
 
 /*
  * SPL related defines.  The Public RAM memory map the ROM defines the
@@ -39,8 +26,6 @@
  * supports X-MODEM loading via UART, and we leverage this and then use
  * Y-MODEM to load u-boot.img, when booted over UART.
  */
-#define CONFIG_SYS_SPL_ARGS_ADDR       (CONFIG_SYS_SDRAM_BASE + \
-                                        (128 << 20))
 
 /* Enable the watchdog inside of SPL */
 
@@ -48,9 +33,6 @@
  * Since SPL did pll and ddr initialization for us,
  * we don't need to do it twice.
  */
-#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_NOR_BOOT)
-#define CONFIG_SKIP_LOWLEVEL_INIT
-#endif
 
 /*
  * When building U-Boot such that there is no previous loader