Merge branch '2020-05-07-more-kconfig-migrations'

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

diff --git a/include/configs/x530.h b/include/configs/x530.h
index b6bff22378978cd56114e3502d5cf79a4de5c0c6..9081f416605ef3492f9ef7ee39ec06b4718cc62a 100644 (file)
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -60,7 +60,6 @@
 
 /* Environment in SPI NOR flash */
 
-#define CONFIG_PHY_MARVELL             /* there is a marvell phy */
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs a longer aneg time */
 
 /* PCIe support */
@@ -84,8 +83,6 @@
  */
 #define CONFIG_SYS_RESET_ADDRESS 0xffff0000    /* Rst Vector Adr */
 
-#define CONFIG_SYS_ALT_MEMTEST
-
 /* Keep device tree and initrd in low memory so the kernel can access them */
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "fdt_high=0x10000000\0"         \