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 6c14ca00c53dc00020a615e5c9918227d55b3740..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.
  */
@@ -85,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