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

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

diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index bdcebd3b5dec128461e114e1a6dc9e3df3993561..0a761639ddd3803b386c66509492f360bc8109fa 100644 (file)
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -45,6 +45,22 @@
 #define CONFIG_KIRKWOOD_RGMII_PAD_1V8  /* Set RGMII Pad voltage to 1.8V */
 #define CONFIG_KIRKWOOD_PCIE_INIT       /* Enable PCIE Port0 for kernel */
 
+/*
+ * 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    0x00600000
+#endif /* CONFIG_SYS_TEXT_BASE */
+
 #define CONFIG_I2C_MVTWSI_BASE KW_TWSI_BASE
 #define MV_UART0_BASE          KW_UART0_BASE
 #define MV_SATA_BASE           KW_SATA_BASE
@@ -131,7 +147,6 @@
  */
 #define CONFIG_SYS_MALLOC_LEN  (1024 * 1024) /* 1MiB for malloc() */
 /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_SIZE       128
 
 /*
  * Other required minimal configurations
@@ -142,6 +157,7 @@
 #define CONFIG_CONSOLE_INFO_QUIET      /* some code reduction */
 #define CONFIG_ARCH_CPU_INIT   /* call arch_cpu_init() */
 #define CONFIG_ARCH_MISC_INIT  /* call arch_misc_init() */
+#define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */
 #define CONFIG_DISPLAY_CPUINFO /* Display cpu info */
 #define CONFIG_NR_DRAM_BANKS   4
 #define CONFIG_STACKSIZE       0x00100000      /* regular stack- 1M */