Merge https://gitlab.denx.de/u-boot/custodians/u-boot-imx

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

diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h
index b19b8a5..0ed00bc 100644 (file)
--- a/include/configs/qemu-mips64.h
+++ b/include/configs/qemu-mips64.h
@@ -30,10 +30,6 @@
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-/*
- * Command line configuration.
- */
-
 #define CONFIG_DRIVER_NE2000
 #define CONFIG_DRIVER_NE2000_BASE      0xffffffffb4000300
 
@@ -73,9 +69,6 @@
 /* default load address */
 #define CONFIG_SYS_LOAD_ADDR           0xffffffff81000000
 
-#define CONFIG_SYS_MEMTEST_START       0xffffffff80100000
-#define CONFIG_SYS_MEMTEST_END         0xffffffff80800000
-
 /*-----------------------------------------------------------------------
  * FLASH and environment organization
  */
@@ -88,15 +81,8 @@
 #define CONFIG_SYS_FLASH_BASE          0xffffffffbfc00000
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_MAX_FLASH_SECT      128
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 
 /* Address and size of Primary Environment Sector */
-#define CONFIG_ENV_SIZE                0x8000
-#define CONFIG_ENV_ADDR                (CONFIG_SYS_FLASH_BASE + (4 << 20) - CONFIG_ENV_SIZE)
-
-#define CONFIG_ENV_OVERWRITE   1
 
 #define MEM_SIZE               128