Merge tag 'efi-2020-07-rc2-4' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h
index a665a5eb7f2b546f60249060472953d5d22214de..6a6c2f2414dc05284d889edd578b09d04508a191 100644 (file)
--- a/include/configs/mt7629.h
+++ b/include/configs/mt7629.h
@@ -24,25 +24,22 @@
 
 /* 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
 
 /* Defines for SPL */
 #define CONFIG_SPL_STACK               0x106000
-#define CONFIG_SPL_TEXT_BASE           0x201000
 #define CONFIG_SPL_MAX_SIZE            SZ_64K
 #define CONFIG_SPL_MAX_FOOTPRINT       SZ_64K
 #define CONFIG_SPL_PAD_TO              0x10000
 
 #define CONFIG_SPI_ADDR                        0x30000000
-#define CONFIG_SYS_SPI_U_BOOT_OFFS     CONFIG_SPL_PAD_TO
 #define CONFIG_SYS_UBOOT_BASE          (CONFIG_SPI_ADDR + CONFIG_SPL_PAD_TO)
 
 /* SPL -> 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)
 
@@ -54,4 +51,8 @@
 /* DRAM */
 #define CONFIG_SYS_SDRAM_BASE          0x40000000
 
+/* Ethernet */
+#define CONFIG_IPADDR                  192.168.1.1
+#define CONFIG_SERVERIP                        192.168.1.2
+
 #endif