Merge tag 'next-20220328' of https://source.denx.de/u-boot/custodians/u-boot-video...

[platform/kernel/u-boot.git] / include / configs / mvebu_armada-8k.h

diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 2f8be2e..8e325e8 100644 (file)
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -24,7 +24,6 @@
 /*
  * Other required minimal configurations
  */
-#define CONFIG_SYS_RESET_ADDRESS 0xffff0000    /* Rst Vector Adr */
 #define CONFIG_SYS_MAXARGS     32      /* max number of command args */
 
 /* End of 16M scrubbed by training in bootrom */
@@ -34,12 +33,6 @@
 
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_ARP_TIMEOUT     200
-#define CONFIG_NET_RETRY_COUNT 50
-
 #define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3)
 
 /* USB ethernet */
@@ -47,21 +40,12 @@
 /*
  * SATA/SCSI/AHCI configuration
  */
-#define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_LBA48
 #define CONFIG_SYS_64BIT_LBA
 
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID    2
-#define CONFIG_SYS_SCSI_MAX_LUN                1
-#define CONFIG_SYS_SCSI_MAX_DEVICE     (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
-                                        CONFIG_SYS_SCSI_MAX_LUN)
-
 /*
  * PCI configuration
  */
-#ifdef CONFIG_PCIE_DW_MVEBU
-#define CONFIG_E1000
-#endif
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 1) \