Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI

[platform/kernel/u-boot.git] / include / configs / sama7g5ek.h

diff --git a/include/configs/sama7g5ek.h b/include/configs/sama7g5ek.h
index ef3bfa3..9b7cc2c 100644 (file)
--- a/include/configs/sama7g5ek.h
+++ b/include/configs/sama7g5ek.h
@@ -11,7 +11,7 @@
 
 #define CONFIG_SYS_AT91_SLOW_CLOCK      32768
 #define CONFIG_SYS_AT91_MAIN_CLOCK      24000000 /* from 24 MHz crystal */
-
+#define CONFIG_SYS_BOOTM_LEN           SZ_32M
 /* SDRAM */
 #define CONFIG_SYS_SDRAM_BASE          0x60000000
 #define CONFIG_SYS_SDRAM_SIZE          0x20000000
@@ -24,9 +24,7 @@
         GENERATED_GBL_DATA_SIZE)
 #endif
 
-#define CONFIG_SYS_LOAD_ADDR           0x62000000 /* load address */
-
-#undef CONFIG_BOOTCOMMAND
+#ifndef CONFIG_BOOTCOMMAND
 #ifdef CONFIG_SD_BOOT
 /* u-boot env in sd/mmc card */
 
@@ -34,10 +32,11 @@
 #define CONFIG_BOOTCOMMAND     "fatload mmc " CONFIG_ENV_FAT_DEVICE_AND_PART " 0x61000000 at91-sama7g5ek.dtb; " \
                                "fatload mmc " CONFIG_ENV_FAT_DEVICE_AND_PART " 0x62000000 zImage; " \
                                "bootz 0x62000000 - 0x61000000"
+#else
+#define CONFIG_BOOTCOMMAND     "Place your bootcommand here"
 #endif
 
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)
+#endif
 
 #define CONFIG_ARP_TIMEOUT             200
 #define CONFIG_NET_RETRY_COUNT         50