Merge branch 'tx28-update' into tx28-bugfix

[karo-tx-uboot.git] / include / configs / mxs.h

diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index dea8227aeb7c83579d6ba0280c11c3615227a1dd..3606c56078dd0383e151784e932f8acf2e73607b 100644 (file)
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -23,17 +23,17 @@
  * Includes
  */
 
-#if defined(CONFIG_MX23) && defined(CONFIG_MX28)
-#error Select either CONFIG_MX23 or CONFIG_MX28 , never both!
-#elif !defined(CONFIG_MX23) && !defined(CONFIG_MX28)
-#error Select one of CONFIG_MX23 or CONFIG_MX28 !
+#if defined(CONFIG_SOC_MX23) && defined(CONFIG_SOC_MX28)
+#error Select either CONFIG_SOC_MX23 or CONFIG_SOC_MX28 , never both!
+#elif !defined(CONFIG_SOC_MX23) && !defined(CONFIG_SOC_MX28)
+#error Select one of CONFIG_SOC_MX23 or CONFIG_SOC_MX28 !
 #endif
 
 #include <asm/arch/regs-base.h>
 
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
 #include <asm/arch/iomux-mx23.h>
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
 #include <asm/arch/iomux-mx28.h>
 #endif
 
@@ -55,6 +55,7 @@
 #define CONFIG_SPL_LDSCRIPT    "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
+#define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_GPIO_SUPPORT
 
 /* Memory sizes */
@@ -64,9 +65,9 @@
 
 /* OCRAM at 0x0 ; 32kB on MX23 ; 128kB on MX28 */
 #define CONFIG_SYS_INIT_RAM_ADDR       0x00000000
-#if defined(CONFIG_MX23)
+#if defined(CONFIG_SOC_MX23)
 #define CONFIG_SYS_INIT_RAM_SIZE       (32 * 1024)
-#elif defined(CONFIG_MX28)
+#elif defined(CONFIG_SOC_MX28)
 #define CONFIG_SYS_INIT_RAM_SIZE       (128 * 1024)
 #endif
 
@@ -94,9 +95,6 @@
 /* U-Boot general configuration */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE      1024            /* Console I/O buffer size */
-#define CONFIG_SYS_PBSIZE      \
-       (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-                                               /* Print buffer size */
 #define CONFIG_SYS_MAXARGS     32              /* Max number of command args */
 #define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE
                                                /* Boot argument buffer size */