Merge branch 'master' into next

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

diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 3ac13a6..7255efc 100644 (file)
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -17,6 +17,7 @@
 #define CFG_SYS_PL310_BASE     0x10502000
 #endif
 
+#define CFG_SYS_BOOTMAPSZ      0x10000000
 #define CFG_SYS_SDRAM_BASE     0x40000000
 #define SDRAM_BANK_SIZE                (256 << 20)     /* 256 MB */
 #define PHYS_SDRAM_1           CFG_SYS_SDRAM_BASE
@@ -37,7 +38,7 @@
        ""PARTS_BOOT" part 0 1;" \
        ""PARTS_ROOT" part 0 2\0" \
 
-#define CONFIG_SET_DFU_ALT_BUF_LEN     (SZ_1K)
+#define CFG_SET_DFU_ALT_BUF_LEN        (SZ_1K)
 
 #define CFG_DFU_ALT_BOOT_EMMC \
        "u-boot raw 0x3e 0x800 mmcpart 1;" \