Merge tag 'xilinx-for-v2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot...

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

diff --git a/include/configs/x530.h b/include/configs/x530.h
index b4e986e..7e0f2c2 100644 (file)
--- a/include/configs/x530.h
+++ b/include/configs/x530.h
@@ -32,11 +32,6 @@
 
 #define CONFIG_CONS_INDEX      1       /*Console on UART0 */
 
-/*
- * Commands configuration
- */
-#define CONFIG_CMD_PCI
-
 /* NAND */
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 #define CONFIG_SYS_MAX_NAND_DEVICE 1
@@ -60,7 +55,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 */
@@ -70,11 +64,6 @@
 
 /* NAND */
 #define CONFIG_SYS_NAND_ONFI_DETECTION
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_LZO
-#define CONFIG_MTD_DEVICE
-#define CONFIG_CMD_MTDPARTS
 
 #define CONFIG_SYS_MALLOC_LEN          (4 << 20)
 
@@ -85,8 +74,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"         \