Merge branch 'master' of git://git.denx.de/u-boot-video

[oweals/u-boot.git] / include / configs / keymile-common.h

diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h
index 0cc1b3b59ce4992287081beb951fee4a45ed180c..e3bd264a80bab29e20264d2a64f93cf267890bab 100644 (file)
--- a/include/configs/keymile-common.h
+++ b/include/configs/keymile-common.h
@@ -29,6 +29,22 @@
 
 #define CONFIG_BOOTCOUNT_LIMIT
 
+/*
+ * By default kwbimage.cfg from board specific folder is used
+ * If for some board, different configuration file need to be used,
+ * CONFIG_SYS_KWD_CONFIG should be defined in board specific header file
+ */
+#ifndef CONFIG_SYS_KWD_CONFIG
+#define        CONFIG_SYS_KWD_CONFIG   $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.cfg
+#endif /* CONFIG_SYS_KWD_CONFIG */
+
+/*
+ * CONFIG_SYS_TEXT_BASE can be defined in board specific header file, if needed
+ */
+#ifndef CONFIG_SYS_TEXT_BASE
+#define        CONFIG_SYS_TEXT_BASE    0x00400000
+#endif /* CONFIG_SYS_TEXT_BASE */
+
 /*
  * Command line configuration.
  */
@@ -68,7 +84,6 @@
 #define CONFIG_SYS_MAXARGS             16      /* max number of command args */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE       /* Boot Argument Buffer Size  */
 #define CONFIG_CMDLINE_EDITING         1       /* add command line history     */
-#define CONFIG_COMMAND_HISTORY         1
 #define CONFIG_AUTO_COMPLETE           /* add autocompletion support   */
 
 #define CONFIG_HUSH_INIT_VAR   1
@@ -86,6 +101,7 @@
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change */
+#define CONFIG_SYS_BOARD_DRAM_INIT     /* Used board specific dram_init */
 
 /*
  * How to get access to the slot ID.  Put this here to make it easy
@@ -125,9 +141,7 @@
 
 #define CONFIG_ENV_SIZE                0x04000 /* Size of Environment */
 
-#define CONFIG_SYS_MALLOC_LEN  (1024 * 1024)   /* Reserved for malloc */
-
-#define CONFIG_SYS_64BIT_VSPRINTF      /* needed for UBI/UBIFS */
+#define CONFIG_SYS_MALLOC_LEN  (4 * 1024 * 1024)
 
 /* UBI Support for all Keymile boards */
 #define CONFIG_CMD_UBI
@@ -142,8 +156,8 @@
 
 #ifdef CONFIG_IO_MUXING
 #define        CONFIG_KM_DEF_ENV_IOMUX \
-       "nc=setenv ethact HDLC ETHERNET \0" \
-       "nce=setenv ethact SCC ETHERNET \0"     \
+       "nc=setenv ethact HDLC \0" \
+       "nce=setenv ethact SCC \0"      \
        "stderr=serial,nc \0"   \
        "stdin=serial,nc \0" \
        "stdout=serial,nc \0" \
@@ -171,7 +185,7 @@
        "kernel_addr_r=200000\0"                                        \
        "fdt_addr_r=600000\0"                                           \
        "ram_ws=800000 \0"                                              \
-       "autoscr_ws=780000 \0"                                          \
+       "script_ws=780000 \0"                                           \
        "fdt_file=" xstr(CONFIG_HOSTNAME) "/"                           \
                xstr(CONFIG_HOSTNAME) ".dtb\0"                          \
        "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin \0"                \
@@ -253,8 +267,8 @@
        "set_new_esw_script=setenv new_esw_script "                     \
                "new_esw_0x${IVM_BoardId}_0x${IVM_HWKey}.scr \0"        \
        "new_esw=run set_new_esw_script; "                              \
-               "tftp ${autoscr_ws} ${new_esw_script}; "                \
-               "iminfo ${autoscr_ws}; source ${autoscr_ws} \0" \
+               "tftp ${script_ws} ${new_esw_script}; "                 \
+               "iminfo ${script_ws}; source ${script_ws} \0"           \
        "bootlimit=0 \0"                                                \
        CONFIG_KM_DEF_ENV_IOMUX                                         \
        CONFIG_KM_DEF_ENV_PRIVATE                                       \