Remove config_distro_defaults.h

[people/ms/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 d1c00506777b714114afa1b90d51fc0ee76135f0..5794bc0d7a679def41f467392cddbeb6aaa6fd66 100644 (file)
--- a/include/configs/meson-gxbb-common.h
+++ b/include/configs/meson-gxbb-common.h
@@ -10,18 +10,13 @@
 
 #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
 #define CONFIG_SYS_INIT_SP_ADDR                0x20000000
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_TEXT_BASE
 
@@ -29,17 +24,24 @@
 #define GICD_BASE                      0xc4301000
 #define GICC_BASE                      0xc4302000
 
-#define CONFIG_CMD_ENV
-
-/* Monitor Command Prompt */
-/* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                       sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-
-#include <config_distro_defaults.h>
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(MMC, mmc, 1) \
+       func(MMC, mmc, 2) \
+       func(PXE, pxe, na) \
+       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 */