Convert CONFIG_SYS_NONCACHED_MEMORY to Kconfig

[u-boot.git] / include / configs / mt7623.h

diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h
index 5129c83da8fd7a2ece14a8c696f99249c7bb0036..73093f94d2b6960a72484ee33f1527f8992b38be 100644 (file)
--- a/include/configs/mt7623.h
+++ b/include/configs/mt7623.h
@@ -12,50 +12,42 @@
 #include <linux/sizes.h>
 
 /* Miscellaneous configurable options */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_CMDLINE_TAG
-
-#define CONFIG_SYS_MAXARGS             8
-#define CONFIG_SYS_BOOTM_LEN           SZ_64M
-#define CONFIG_SYS_CBSIZE              SZ_1K
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE +    \
-                                       sizeof(CONFIG_SYS_PROMPT) + 16)
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          SZ_4M
-#define CONFIG_SYS_NONCACHED_MEMORY    SZ_1M
 
 /* Environment */
-#define CONFIG_ENV_SIZE                        SZ_4K
-/* Allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
 
 /* Preloader -> Uboot */
-#define CONFIG_SYS_UBOOT_START         CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE + SZ_2M - \
-                                        GENERATED_GBL_DATA_SIZE)
-
-/* UBoot -> Kernel */
-#define CONFIG_LOADADDR                        0x84000000
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
 /* MMC */
 #define MMC_SUPPORTS_TUNING
-#define CONFIG_SUPPORT_EMMC_BOOT
 
 /* DRAM */
 #define CONFIG_SYS_SDRAM_BASE          0x80000000
 
 /* This is needed for kernel booting */
-#define FDT_HIGH                       "fdt_high=0xac000000\0"
+#define FDT_HIGH                       "0xac000000"
 
-/* Extra environment variables */
-#define CONFIG_EXTRA_ENV_SETTINGS      \
-       FDT_HIGH
+#define ENV_MEM_LAYOUT_SETTINGS                                \
+       "fdt_high=" FDT_HIGH "\0"                       \
+       "kernel_addr_r=0x84000000\0"                    \
+       "fdt_addr_r=" FDT_HIGH "\0"                     \
+       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0"
 
 /* Ethernet */
 #define CONFIG_IPADDR                  192.168.1.1
 #define CONFIG_SERVERIP                        192.168.1.2
 
+#ifdef CONFIG_DISTRO_DEFAULTS
+
+#define BOOT_TARGET_DEVICES(func)      \
+               func(MMC, mmc, 1)
+
+#include <config_distro_bootcmd.h>
+
+/* Extra environment variables */
+#define CONFIG_EXTRA_ENV_SETTINGS      \
+       ENV_MEM_LAYOUT_SETTINGS         \
+       BOOTENV
+
+#endif /* ifdef CONFIG_DISTRO_DEFAULTS*/
+
 #endif