Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index a4f2af4..52d632b 100644 (file)
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -26,8 +26,6 @@
 #undef CONFIG_MPC83XX_PCI2             /* support for 2nd PCI controller */
 
 #undef CONFIG_SYS_DRAM_TEST                    /* memory test, takes time */
-#define CONFIG_SYS_MEMTEST_START       0x00000000      /* memtest region */
-#define CONFIG_SYS_MEMTEST_END         0x00100000
 
 /*
  * DDR Setup
@@ -157,7 +155,6 @@
 
 #if defined(CONFIG_PCI)
 
-#undef CONFIG_EEPRO100
 #undef CONFIG_TULIP
 
 #if !defined(CONFIG_PCI_PNP)
@@ -199,17 +196,7 @@
  * Environment
  */
 #ifndef CONFIG_SYS_RAMBOOT
-       #define CONFIG_ENV_ADDR         (CONFIG_SYS_MONITOR_BASE + 0xc0000)
-       #define CONFIG_ENV_SECT_SIZE    0x20000 /* 128K(one sector) for env */
-       #define CONFIG_ENV_SIZE         0x2000
-
 /* Address and size of Redundant Environment Sector    */
-#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
-
-#else
-       #define CONFIG_ENV_ADDR         (CONFIG_SYS_MONITOR_BASE - 0x1000)
-       #define CONFIG_ENV_SIZE         0x2000
 #endif
 
 #define CONFIG_LOADS_ECHO              /* echo on for serial download */
@@ -220,9 +207,6 @@
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-/*
- * Command line configuration.
- */
 #define CONFIG_SYS_RTC_BUS_NUM  0x01
 #define CONFIG_SYS_I2C_RTC_ADDR        0x32