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

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

diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index 16a49c7..49279fc 100644 (file)
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -45,13 +45,9 @@
  * Other required minimal configurations
  */
 #define CONFIG_SYS_LOAD_ADDR   0x00800000      /* default load adr- 8M */
-#define CONFIG_SYS_MEMTEST_START 0x00800000    /* 8M */
-#define CONFIG_SYS_MEMTEST_END 0x00ffffff      /*(_16M -1) */
 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000    /* Rst Vector Adr */
 #define CONFIG_SYS_MAXARGS     32      /* max number of command args */
 
-#define CONFIG_SYS_ALT_MEMTEST
-
 /* End of 16M scrubbed by training in bootrom */
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_TEXT_BASE + 0xFF0000)
 
@@ -62,9 +58,6 @@
 #define CONFIG_SYS_I2C_SLAVE           0x0
 
 /* Environment in SPI NOR flash */
-#define CONFIG_ENV_OFFSET              0x180000 /* as Marvell U-Boot version */
-#define CONFIG_ENV_SIZE                        (64 << 10) /* 64KiB */
-#define CONFIG_ENV_SECT_SIZE           (64 << 10) /* 64KiB sectors */
 
 /*
  * Ethernet Driver configuration
@@ -72,7 +65,6 @@
 #define CONFIG_ENV_OVERWRITE   /* ethaddr can be reprogrammed */
 #define CONFIG_ARP_TIMEOUT     200
 #define CONFIG_NET_RETRY_COUNT 50
-#define CONFIG_PHY_MARVELL
 
 #define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3)