Merge https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[platform/kernel/u-boot.git] / include / configs / mvebu_armada-37xx.h

diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 93c05e3..0d58560 100644 (file)
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -6,6 +6,8 @@
 #ifndef _CONFIG_MVEBU_ARMADA_37XX_H
 #define _CONFIG_MVEBU_ARMADA_37XX_H
 
+#include <linux/sizes.h>
+
 /*
  * High Level Configuration Options (easy to change)
  */
@@ -13,7 +15,7 @@
 /* additions for new ARM relocation support */
 #define CONFIG_SYS_SDRAM_BASE  0x00000000
 
-/* auto boot */
+#define CONFIG_SYS_BOOTM_LEN   SZ_64M /* Increase max gunzip size */
 
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, \
                                          115200, 230400, 460800, 921600 }
@@ -53,11 +55,8 @@
 /*
  * SPI Flash configuration
  */
-
 #define CONFIG_MTD_PARTITIONS          /* required for UBI partition support */
 
-/* Environment in SPI NOR flash */
-
 /*
  * Ethernet Driver configuration
  */
@@ -66,8 +65,6 @@
 
 #define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3)
 
-/* USB ethernet */
-
 /*
  * SATA/SCSI/AHCI configuration
  */
@@ -90,10 +87,13 @@
 
 #include <config_distro_bootcmd.h>
 
+/* fdt_addr and kernel_addr are needed for existing distribution boot scripts */
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "scriptaddr=0x6d00000\0"        \
        "pxefile_addr_r=0x6e00000\0"    \
+       "fdt_addr=0x6f00000\0"          \
        "fdt_addr_r=0x6f00000\0"        \
+       "kernel_addr=0x7000000\0"       \
        "kernel_addr_r=0x7000000\0"     \
        "ramdisk_addr_r=0xa000000\0"    \
        BOOTENV