Merge branch 'network_master' of https://source.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index 08a4d01..c58545b 100644 (file)
--- a/include/configs/mt7629.h
+++ b/include/configs/mt7629.h
@@ -12,9 +12,6 @@
 #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
@@ -22,8 +19,6 @@
 #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 */
@@ -43,8 +38,6 @@
 
 /* UBoot -> Kernel */
 #define CONFIG_SYS_SPL_ARGS_ADDR       0x40000000
-#define CONFIG_LOADADDR                        0x42007f1c
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
 
 /* DRAM */
 #define CONFIG_SYS_SDRAM_BASE          0x40000000