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

[platform/kernel/u-boot.git] / include / configs / meson-gxbb-common.h

diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h
index eaf6a9c..f1734c0 100644 (file)
--- a/include/configs/meson-gxbb-common.h
+++ b/include/configs/meson-gxbb-common.h
@@ -10,15 +10,12 @@
 
 #define CONFIG_CPU_ARMV8
 #define CONFIG_REMAKE_ELF
-#define CONFIG_SYS_CACHELINE_SIZE      64
-#define CONFIG_SYS_NO_FLASH
 #define CONFIG_NR_DRAM_BANKS           1
 #define CONFIG_ENV_IS_NOWHERE          1
 #define CONFIG_ENV_SIZE                        0x2000
 #define CONFIG_SYS_MAXARGS             32
 #define CONFIG_SYS_MALLOC_LEN          (32 << 20)
 #define CONFIG_SYS_CBSIZE              1024
-#define CONFIG_MISC_INIT_R
 
 #define CONFIG_SYS_SDRAM_BASE          0
 #define CONFIG_SYS_TEXT_BASE           0x01000000
@@ -41,4 +38,23 @@
 
 #include <config_distro_defaults.h>
 
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(MMC, mmc, 1) \
+       func(MMC, mmc, 2) \
+       func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+       "fdt_addr_r=0x01000000\0" \
+       "scriptaddr=0x1f000000\0" \
+       "kernel_addr_r=0x01080000\0" \
+       "pxefile_addr_r=0x01080000\0" \
+       "ramdisk_addr_r=0x13000000\0" \
+       MESON_FDTFILE_SETTING \
+       BOOTENV
+
+#define CONFIG_SYS_BOOTM_LEN    (64 << 20)      /* 64 MiB */
+
 #endif /* __MESON_GXBB_COMMON_CONFIG_H */