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 6e9b868aa49054ef6231df27b29c2ba7ff580e4c..6a6c2f2414dc05284d889edd578b09d04508a191 100644 (file)
--- a/include/configs/mt7629.h
+++ b/include/configs/mt7629.h
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_NONCACHED_MEMORY    SZ_1M
 
 /* Environment */
-#define CONFIG_ENV_SIZE                        SZ_4K
 /* Allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
@@ -38,11 +37,9 @@
 #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)