Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

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

diff --git a/include/configs/makalu.h b/include/configs/makalu.h
index ae07dc72a424dde94896f05377486fa75d7253fe..6c1b136659abae34d237de17600e1aac3f95cf4c 100644 (file)
--- a/include/configs/makalu.h
+++ b/include/configs/makalu.h
@@ -89,8 +89,7 @@
 #endif /* defined(CONFIG_SYS_INIT_DCACHE_CS) */
 
 #define CONFIG_SYS_INIT_RAM_SIZE        (4 << 10)                      /*  4 KiB */
-#define CONFIG_SYS_GBL_DATA_SIZE       256             /* num bytes initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /*
  * If the data cache is being used for the primordial stack and global
@@ -253,7 +252,6 @@
  */
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DTT
-#define CONFIG_CMD_LOG
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_SNTP