diff options
| author | Tom Rini <trini@konsulko.com> | 2022-02-09 09:29:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-09 09:29:07 -0500 |
| commit | 859703251251d9567f29ab10c0a29f98eb0aff5c (patch) | |
| tree | e0863f7cced9c153b8b083575d52faec05fae8d7 /include/configs | |
| parent | 531c00894577a0a852431adf61ade76925f8b162 (diff) | |
| parent | cccc4ab86f5e64ea6fe1e79b3ca2453baa049120 (diff) | |
Merge branch '2022-02-08-Kconfig-updates'
- Assorted general code cleanups to make sure we use the right macros
and use them correctly and buildman updates around kconfig.h itself.
- Convert some IDE and SCSI symbols to Kconfig.
- Convert CONFIG_REMAKE_ELF
- Introduce conversion deadline for DM_SCSI.
Diffstat (limited to 'include/configs')
99 files changed, 0 insertions, 343 deletions
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 6ba5c525431..c27f0a5a2d7 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -23,21 +23,8 @@ #ifdef CONFIG_IDE /* ATA */ -# define CONFIG_IDE_RESET 1 # define CONFIG_IDE_PREINIT 1 -# define CONFIG_ATAPI # undef CONFIG_LBA48 - -# define CONFIG_SYS_IDE_MAXBUS 1 -# define CONFIG_SYS_IDE_MAXDEVICE 2 - -# define CONFIG_SYS_ATA_BASE_ADDR (CONFIG_SYS_MBAR2 + 0x800) -# define CONFIG_SYS_ATA_IDE0_OFFSET 0 - -# define CONFIG_SYS_ATA_DATA_OFFSET 0xA0 /* Offset for data I/O */ -# define CONFIG_SYS_ATA_REG_OFFSET 0xA0 /* Offset for normal register accesses */ -# define CONFIG_SYS_ATA_ALT_OFFSET 0xC0 /* Offset for alternate registers */ -# define CONFIG_SYS_ATA_STRIDE 4 /* Interval between registers */ #endif #define CONFIG_DRIVER_DM9000 diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 977d96a5a76..538d9c21978 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -275,7 +275,6 @@ /* * SATA */ -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1_OFFSET 0x18000 #define CONFIG_SYS_SATA1 (CONFIG_SYS_IMMR + CONFIG_SYS_SATA1_OFFSET) diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 23b9969f84b..106d1e6a4b7 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -544,7 +544,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index ceaed464fe0..e6d5321070b 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -349,7 +349,6 @@ #define CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/P4080DS.h b/include/configs/P4080DS.h index ed88b418441..8a0c7039f66 100644 --- a/include/configs/P4080DS.h +++ b/include/configs/P4080DS.h @@ -11,7 +11,6 @@ #define CONFIG_PCIE3 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_LBA48 #define CONFIG_SYS_SRIO diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index f60010f7876..9433f14227b 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -438,7 +438,6 @@ /* SATA */ #define CONFIG_FSL_SATA_V2 #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index f0bdcbae630..a41f9f0d9b8 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -488,7 +488,6 @@ * SATA */ #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 86dc5bfe82a..7165ba08283 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -443,7 +443,6 @@ * SATA */ #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 6923774a16f..daccd816c10 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -180,7 +180,6 @@ /* SATA */ #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA @@ -466,7 +465,6 @@ /* SATA */ #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 956844414f8..ff0498acdec 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -48,13 +48,6 @@ #define CONFIG_NET_RETRY_COUNT 10 #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */ -/* SATA */ -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) - /* * Default to using SPI for environment, etc. * 0x000000 - 0x040000 : QSPI.SPL (256KiB) diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index c2b0d6ff3e6..c87bcd475ef 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -9,8 +9,6 @@ #include <asm/arch/imx-regs.h> #include <linux/sizes.h> -#define CONFIG_REMAKE_ELF - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000 diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h index 402fed1bba3..8a6f294ae89 100644 --- a/include/configs/apalis-imx8x.h +++ b/include/configs/apalis-imx8x.h @@ -10,8 +10,6 @@ #include <linux/sizes.h> #include <linux/stringify.h> -#define CONFIG_REMAKE_ELF - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000 diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 1cde5f77f22..70689a6f0fd 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -32,8 +32,6 @@ #define CONFIG_FACTORYSET -#define CONFIG_REMAKE_ELF - /* ENET Config */ #define CONFIG_FEC_XCV_TYPE RMII diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index d5549f62cee..ce36b2e3eae 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -28,8 +28,6 @@ #define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif -#define CONFIG_REMAKE_ELF - /* Flat Device Tree Definitions */ #define CONFIG_SYS_BOOTMAPSZ (256 << 20) diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index c9af5a40cec..871e87c26d0 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -35,15 +35,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif -/* SATA support */ -#ifdef CONFIG_SCSI -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) -#endif - /* Keep device tree and initrd in lower memory so the kernel can access them */ #define RELOCATION_LIMITS_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 40bc8215480..c19aaaccb10 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -160,7 +160,6 @@ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* For OTG port */ /* SATA */ -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_LBA48 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 01182505cc8..008fa6ef076 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -10,8 +10,6 @@ #include <linux/sizes.h> #include <linux/stringify.h> -#define CONFIG_REMAKE_ELF - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5b010000 #define USDHC2_BASE_ADDR 0x5b020000 diff --git a/include/configs/comtrend_ar5315u.h b/include/configs/comtrend_ar5315u.h index 9f4b4e28045..7bfc8bbe368 100644 --- a/include/configs/comtrend_ar5315u.h +++ b/include/configs/comtrend_ar5315u.h @@ -6,4 +6,3 @@ #include <configs/bmips_common.h> #include <configs/bmips_bcm6318.h> -#define CONFIG_REMAKE_ELF diff --git a/include/configs/comtrend_ar5387un.h b/include/configs/comtrend_ar5387un.h index 888a6d89859..36d6a7f88ae 100644 --- a/include/configs/comtrend_ar5387un.h +++ b/include/configs/comtrend_ar5387un.h @@ -6,4 +6,3 @@ #include <configs/bmips_common.h> #include <configs/bmips_bcm6328.h> -#define CONFIG_REMAKE_ELF diff --git a/include/configs/comtrend_ct5361.h b/include/configs/comtrend_ct5361.h index 10e29699480..1ac107599d7 100644 --- a/include/configs/comtrend_ct5361.h +++ b/include/configs/comtrend_ct5361.h @@ -6,4 +6,3 @@ #include <configs/bmips_common.h> #include <configs/bmips_bcm6348.h> -#define CONFIG_REMAKE_ELF diff --git a/include/configs/comtrend_vr3032u.h b/include/configs/comtrend_vr3032u.h index ee29f702f8f..a46b3946bf5 100644 --- a/include/configs/comtrend_vr3032u.h +++ b/include/configs/comtrend_vr3032u.h @@ -6,8 +6,6 @@ #include <configs/bmips_common.h> #include <configs/bmips_bcm63268.h> -#define CONFIG_REMAKE_ELF - #ifdef CONFIG_MTD_RAW_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1 #endif /* CONFIG_MTD_RAW_NAND */ diff --git a/include/configs/comtrend_wap5813n.h b/include/configs/comtrend_wap5813n.h index f786c465bac..d9d31289d7d 100644 --- a/include/configs/comtrend_wap5813n.h +++ b/include/configs/comtrend_wap5813n.h @@ -6,4 +6,3 @@ #include <configs/bmips_common.h> #include <configs/bmips_bcm6368.h> -#define CONFIG_REMAKE_ELF diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h index ff385d9c6be..7fb96e8ad59 100644 --- a/include/configs/controlcenterdc.h +++ b/include/configs/controlcenterdc.h @@ -18,15 +18,6 @@ * U-Boot into it. */ -/* - * SATA/SCSI/AHCI configuration - */ -#define CONFIG_SCSI_AHCI_PLAT -#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) - /* Environment in SPI NOR flash */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index d6d679fd7dd..23c493b2582 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -22,14 +22,5 @@ "stderr=serial,vidconsole\0" /* ATA/IDE support */ -#define CONFIG_SYS_IDE_MAXBUS 2 -#define CONFIG_SYS_IDE_MAXDEVICE 4 -#define CONFIG_SYS_ATA_BASE_ADDR 0 -#define CONFIG_SYS_ATA_DATA_OFFSET 0 -#define CONFIG_SYS_ATA_REG_OFFSET 0 -#define CONFIG_SYS_ATA_ALT_OFFSET 0 -#define CONFIG_SYS_ATA_IDE0_OFFSET 0x1f0 -#define CONFIG_SYS_ATA_IDE1_OFFSET 0x170 -#define CONFIG_ATAPI #endif /* __CONFIG_H */ diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 6d272c6d880..bd264122da7 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -347,7 +347,6 @@ /* SATA */ #ifdef CONFIG_FSL_SATA_V2 -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 #define CONFIG_SYS_SATA1 CONFIG_SYS_MPC85xx_SATA1_ADDR #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 5f2611995d3..8dc73e8b1cc 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -13,15 +13,6 @@ /* I2C */ #define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE -/* - * SATA/SCSI/AHCI configuration - */ -#define CONFIG_SCSI_AHCI_PLAT -#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) - /* Environment in SPI NOR flash */ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 449a56753b1..7baae3b090d 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -28,7 +28,6 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ /* SATA support */ -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_LBA48 /* PCIe support */ diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index aec30c461de..711e37cb9bd 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -74,9 +74,6 @@ /* SPI SPL */ -/* SATA */ -#define CONFIG_SCSI_AHCI_PLAT - /* NAND support */ #ifdef CONFIG_MTD_RAW_NAND /* NAND: device related configs */ diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 624f611c8ba..9f765fa4937 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -12,7 +12,6 @@ #include <asm/arch/sysmap-apq8016.h> /* Build new ELF image from u-boot.bin (U-Boot + appended DTB) */ -#define CONFIG_REMAKE_ELF /* Physical Memory Map */ #define PHYS_SDRAM_1 0x80000000 diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index beea234d8dc..0b3ee131ae6 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -45,7 +45,6 @@ * SATA Driver configuration */ #ifdef CONFIG_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_LBA48 #endif /* CONFIG_SATA */ diff --git a/include/configs/durian.h b/include/configs/durian.h index c0ea42e180a..f0789d5fb3a 100644 --- a/include/configs/durian.h +++ b/include/configs/durian.h @@ -18,13 +18,6 @@ /* PCI CONFIG */ #define CONFIG_PCI_SCAN_SHOW -/* SCSI */ -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE 128 -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SATA_MAX_DEVICE 4 - /* BOOT */ #define CONFIG_SYS_BOOTM_LEN (60 * 1024 * 1024) diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 90e387e6c5e..a599722ae3b 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -110,20 +110,12 @@ #ifdef CONFIG_IDE #define __io /* Data, registers and alternate blocks are at the same offset */ -#define CONFIG_SYS_ATA_DATA_OFFSET (0x0100) -#define CONFIG_SYS_ATA_REG_OFFSET (0x0100) -#define CONFIG_SYS_ATA_ALT_OFFSET (0x0100) /* Each 8-bit ATA register is aligned to a 4-bytes address */ -#define CONFIG_SYS_ATA_STRIDE 4 /* Controller supports 48-bits LBA addressing */ #define CONFIG_LBA48 /* A single bus, a single device */ -#define CONFIG_SYS_IDE_MAXBUS 1 -#define CONFIG_SYS_IDE_MAXDEVICE 1 /* ATA registers base is at SATA controller base */ -#define CONFIG_SYS_ATA_BASE_ADDR ORION5X_SATA_BASE /* ATA bus 0 is orion5x port 1 on ED Mini V2 */ -#define CONFIG_SYS_ATA_IDE0_OFFSET ORION5X_SATA_PORT1_OFFSET /* end of IDE defines */ #endif /* CMD_IDE */ diff --git a/include/configs/efi-x86_payload.h b/include/configs/efi-x86_payload.h index 1cf5c037e85..59fad4c15db 100644 --- a/include/configs/efi-x86_payload.h +++ b/include/configs/efi-x86_payload.h @@ -19,14 +19,5 @@ "stderr=serial,vidconsole\0" /* ATA/IDE support */ -#define CONFIG_SYS_IDE_MAXBUS 2 -#define CONFIG_SYS_IDE_MAXDEVICE 4 -#define CONFIG_SYS_ATA_BASE_ADDR 0 -#define CONFIG_SYS_ATA_DATA_OFFSET 0 -#define CONFIG_SYS_ATA_REG_OFFSET 0 -#define CONFIG_SYS_ATA_ALT_OFFSET 0 -#define CONFIG_SYS_ATA_IDE0_OFFSET 0x1f0 -#define CONFIG_SYS_ATA_IDE1_OFFSET 0x170 -#define CONFIG_ATAPI #endif /* __CONFIG_H */ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index bde14a7b3da..402c5bfacbe 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -21,7 +21,6 @@ /* SATA Configs */ #ifdef CONFIG_CMD_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h index c2795792683..51e671a9517 100644 --- a/include/configs/goflexhome.h +++ b/include/configs/goflexhome.h @@ -48,7 +48,6 @@ #endif /* SATA driver configuration */ -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_LBA48 #endif /* _CONFIG_GOFLEXHOME_H */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 8f73c3b873c..668d00cbc0e 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -41,7 +41,6 @@ * SATA Configs */ #ifdef CONFIG_CMD_SATA - #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/helios4.h b/include/configs/helios4.h index de1ebbf3751..151ab66f4c3 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -35,15 +35,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif -/* SATA support */ -#ifdef CONFIG_SCSI -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) -#endif - /* Keep device tree and initrd in lower memory so the kernel can access them */ #define RELOCATION_LIMITS_ENV_SETTINGS \ "fdt_high=0x10000000\0" \ diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 4ef3a46cfb9..55c874bf619 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -16,12 +16,6 @@ #define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 5 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) - #define CONFIG_BOOT_RETRY_TIME -1 #define CONFIG_RESET_TO_RETRY diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 387971c687b..c5f9bcea8e7 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -15,8 +15,6 @@ #define CONFIG_POWER_HI6553 -#define CONFIG_REMAKE_ELF - #define CONFIG_SYS_BOOTM_LEN SZ_64M /* Physical Memory Map */ diff --git a/include/configs/huawei_hg556a.h b/include/configs/huawei_hg556a.h index 7c88af0532d..5400d1256ee 100644 --- a/include/configs/huawei_hg556a.h +++ b/include/configs/huawei_hg556a.h @@ -6,4 +6,3 @@ #include <configs/bmips_common.h> #include <configs/bmips_bcm6358.h> -#define CONFIG_REMAKE_ELF diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index 9783fd89ec0..2598deaac6e 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -40,8 +40,6 @@ */ #ifdef CONFIG_IDE #define __io -#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET -#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET #endif /* CONFIG_IDE */ #endif /* _CONFIG_IB62x0_H */ diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index 28435359739..e2e322bb4d3 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -29,8 +29,6 @@ #endif /* CONFIG_SPL_BUILD */ -#define CONFIG_REMAKE_ELF - /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index b099004937d..d3cf7ab0a7d 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -30,8 +30,6 @@ #endif -#define CONFIG_REMAKE_ELF - /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index 5f587f73363..4aaed3ae7da 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -35,8 +35,6 @@ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 #endif -#define CONFIG_REMAKE_ELF - /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 1668ca8acf3..16a2c2cf9d5 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -29,8 +29,6 @@ #undef CONFIG_DM_MMC #endif -#define CONFIG_REMAKE_ELF - /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 884d741789f..c12f383655b 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -29,8 +29,6 @@ #define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif -#define CONFIG_REMAKE_ELF - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5B010000 #define USDHC2_BASE_ADDR 0x5B020000 diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 973793fc9dd..5fcc96325ad 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -9,7 +9,6 @@ #include <linux/sizes.h> #include <linux/stringify.h> #include <asm/arch/imx-regs.h> -#define CONFIG_REMAKE_ELF #define CONFIG_SPL_MAX_SIZE (124 * 1024) #define CONFIG_SPL_BSS_START_ADDR 0x00128000 diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 3900ef1b500..b1c51e72bf6 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -27,8 +27,6 @@ #define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif -#define CONFIG_REMAKE_ELF - #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define USDHC1_BASE_ADDR 0x5B010000 #define USDHC2_BASE_ADDR 0x5B020000 diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index 6b25b485dec..7da6802aa5f 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -27,8 +27,6 @@ #endif -#define CONFIG_REMAKE_ELF - /* ENET Config */ #if defined(CONFIG_FEC_MXC) #define CONFIG_ETHPRIME "FEC" diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 046f1888cb1..0a988e2fadf 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -9,8 +9,6 @@ #include "mv-common.h" /* Remove or override few declarations from mv-common.h */ -#undef CONFIG_SYS_IDE_MAXBUS -#undef CONFIG_SYS_IDE_MAXDEVICE /* * Enable platform initialisation via misc_init_r() function @@ -32,9 +30,6 @@ #define CONFIG_LBA48 #if defined(CONFIG_NETSPACE_MAX_V2) || defined(CONFIG_D2NET_V2) || \ defined(CONFIG_NET2BIG_V2) -#define CONFIG_SYS_SATA_MAX_DEVICE 2 -#else -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #endif #endif /* CONFIG_SATA */ diff --git a/include/configs/ls1012a2g5rdb.h b/include/configs/ls1012a2g5rdb.h index bda4283ef5a..0263bb82893 100644 --- a/include/configs/ls1012a2g5rdb.h +++ b/include/configs/ls1012a2g5rdb.h @@ -14,15 +14,9 @@ #define CONFIG_SYS_SDRAM_SIZE 0x40000000 /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA AHCI_BASE_ADDR -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) - #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ "verify=no\0" \ diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index 5d561009c56..f92ff17eeb8 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -31,15 +31,9 @@ #define CONFIG_SYS_FSL_QSPI_BASE 0x40000000 /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA AHCI_BASE_ADDR -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) - /* I2C */ /* GPIO */ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 7b4044fba72..2e5b804a4cb 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -81,18 +81,12 @@ */ /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT #ifndef PCI_DEVICE_ID_FREESCALE_AHCI #define PCI_DEVICE_ID_FREESCALE_AHCI 0x0440 #endif #define CONFIG_SCSI_DEV_LIST {PCI_VENDOR_ID_FREESCALE, \ PCI_DEVICE_ID_FREESCALE_AHCI} -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) - /* SPI */ /* diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index f47bc739843..a517346c129 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -6,8 +6,6 @@ #ifndef __L1028A_COMMON_H #define __L1028A_COMMON_H -#define CONFIG_REMAKE_ELF - #include <asm/arch/stream_id_lsch3.h> #include <asm/arch/config.h> #include <asm/arch/soc.h> diff --git a/include/configs/ls1028aqds.h b/include/configs/ls1028aqds.h index 8e3bd7790fe..1b4d181310f 100644 --- a/include/configs/ls1028aqds.h +++ b/include/configs/ls1028aqds.h @@ -72,13 +72,8 @@ #endif /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) #ifndef SPL_NO_ENV #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/ls1028ardb.h b/include/configs/ls1028ardb.h index 5ce9ebbae93..0770f4e268a 100644 --- a/include/configs/ls1028ardb.h +++ b/include/configs/ls1028ardb.h @@ -57,14 +57,9 @@ #endif /* SATA */ -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) #define SCSI_VEND_ID 0x1b4b #define SCSI_DEV_ID 0x9170 #define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 /* Initial environment variables */ diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 3b4f822ecff..83b95c242f0 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -26,8 +26,6 @@ #define SPL_NO_IFC #endif -#define CONFIG_REMAKE_ELF - #include <asm/arch/stream_id_lsch2.h> #include <asm/arch/config.h> diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 5f9cb97855a..ea6831bb827 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -46,7 +46,6 @@ #endif /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT /* EEPROM */ #define CONFIG_SYS_I2C_EEPROM_NXID @@ -54,11 +53,6 @@ #define CONFIG_SYS_SATA AHCI_BASE_ADDR -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) - /* * IFC Definitions */ diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 6d9cbc8c7df..31b578ae33b 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -234,10 +234,6 @@ /* SATA */ #ifndef SPL_NO_SATA -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 2 -#define CONFIG_SYS_SCSI_MAX_LUN 2 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) #define SCSI_VEND_ID 0x1b4b #define SCSI_DEV_ID 0x9170 #define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index d07d27d1f5c..7552610e035 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -26,8 +26,6 @@ #define SPL_NO_IFC #endif -#define CONFIG_REMAKE_ELF - #include <asm/arch/config.h> #include <asm/arch/stream_id_lsch2.h> @@ -124,14 +122,7 @@ /* SATA */ #ifndef SPL_NO_SATA -#define CONFIG_SCSI_AHCI_PLAT - #define CONFIG_SYS_SATA AHCI_BASE_ADDR - -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) #endif /* FMan ucode */ diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 2e52108c23e..33b70c8d8f6 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -20,8 +20,6 @@ #undef CONFIG_DISPLAY_CPUINFO #endif -#define CONFIG_REMAKE_ELF - #include <asm/arch/stream_id_lsch3.h> #include <asm/arch/config.h> #include <asm/arch/soc.h> @@ -130,13 +128,7 @@ unsigned long long get_qixis_addr(void); /* SATA */ #ifdef CONFIG_SCSI -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 - -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) #endif /* Physical Memory Map */ diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index eea6ce53db5..f2725af0534 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -7,8 +7,6 @@ #ifndef __LS2_COMMON_H #define __LS2_COMMON_H -#define CONFIG_REMAKE_ELF - #include <asm/arch/stream_id_lsch3.h> #include <asm/arch/config.h> diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 07cf59fcb8f..7554de1f6d3 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -33,16 +33,10 @@ #endif /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 #define CONFIG_SYS_SATA2 AHCI_BASE_ADDR2 -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) - #define CONFIG_SYS_NOR0_CSPR_EXT (0x0) #define CONFIG_SYS_NOR_AMASK IFC_AMASK(128*1024*1024) #define CONFIG_SYS_NOR_AMASK_EARLY IFC_AMASK(64*1024*1024) diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index 6d8effea744..1c05b086778 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -43,16 +43,10 @@ #endif /* SATA */ -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 #define CONFIG_SYS_SATA2 AHCI_BASE_ADDR2 -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) - #if !defined(CONFIG_FSL_QSPI) || defined(CONFIG_TFABOOT) #define CONFIG_SYS_NOR0_CSPR_EXT (0x0) diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index e8e02e7f7b8..7fa4f00734c 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -96,7 +96,6 @@ #endif /* CONFIG_CMD_NET */ #ifdef CONFIG_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_SYS_64BIT_LBA #define CONFIG_LBA48 #endif diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index e285109cbba..e31f8d087f7 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -10,7 +10,6 @@ #include <asm/arch/config.h> #include <asm/arch/soc.h> -#define CONFIG_REMAKE_ELF #define CONFIG_FSL_MEMAC #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE @@ -110,13 +109,8 @@ /* SATA */ #ifdef CONFIG_SCSI -#define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 #define CONFIG_SYS_SATA2 AHCI_BASE_ADDR2 -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) #endif /* USB */ diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 4a1d959d17c..8486cf8fc6e 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -99,7 +99,6 @@ * SATA */ #ifdef CONFIG_CMD_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/malta.h b/include/configs/malta.h index 61860ee6942..6d150fd557c 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -63,12 +63,6 @@ /* * IDE/ATA */ -#define CONFIG_SYS_IDE_MAXBUS 1 -#define CONFIG_SYS_IDE_MAXDEVICE 2 -#define CONFIG_SYS_ATA_BASE_ADDR CONFIG_SYS_ISA_IO_BASE_ADDRESS -#define CONFIG_SYS_ATA_IDE0_OFFSET 0x01f0 -#define CONFIG_SYS_ATA_DATA_OFFSET 0 -#define CONFIG_SYS_ATA_REG_OFFSET 0 /* * Commands diff --git a/include/configs/meson64.h b/include/configs/meson64.h index 44f2967fc6b..196e58ed9a3 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -29,7 +29,6 @@ #define STDIN_CFG "serial" #endif -#define CONFIG_REMAKE_ELF #define CONFIG_SYS_MAXARGS 32 #define CONFIG_SYS_CBSIZE 1024 diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index e7f7e772fc7..fd9ce344dbd 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -51,15 +51,9 @@ /* * 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) - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index ac0fdddbd94..44bba6555cb 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -46,15 +46,9 @@ /* * 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 */ diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 92140df4be1..01ed221873a 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -125,7 +125,6 @@ #define CONFIG_BOARD_SIZE_LIMIT 785408 #ifdef CONFIG_CMD_SATA - #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 7d3e651f44d..1c25857296c 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -18,7 +18,6 @@ /* SATA Configuration */ #ifdef CONFIG_CMD_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/netgear_dgnd3700v2.h b/include/configs/netgear_dgnd3700v2.h index f14316c8456..c1508059ce6 100644 --- a/include/configs/netgear_dgnd3700v2.h +++ b/include/configs/netgear_dgnd3700v2.h @@ -6,4 +6,3 @@ #include <configs/bmips_common.h> #include <configs/bmips_bcm6362.h> -#define CONFIG_REMAKE_ELF diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 1a1c08bd308..678b433cd7b 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -23,7 +23,6 @@ * SATA Configs */ #ifdef CONFIG_CMD_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 8cc9ca6a49d..ccf4519119a 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -32,7 +32,6 @@ /* SATA driver configuration */ #ifdef CONFIG_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_LBA48 #endif /* CONFIG_SATA */ diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 188ab0bf365..75e84c35ee0 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -49,10 +49,4 @@ #define CONSOLEDEV "ttyS2" -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) - #endif /* __CONFIG_OMAP5_EVM_H */ diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 43d089657b1..7dad002f3b8 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -59,9 +59,5 @@ /* * SATA Driver configuration */ -#ifdef CONFIG_MVSATA_IDE -#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET -#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET -#endif /*CONFIG_MVSATA_IDE*/ #endif /* _CONFIG_OPENRD_BASE_H */ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index b993ec8316f..92008cd38e4 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -138,7 +138,6 @@ #define CONFIG_PCIE1 /* PCIE controller 1 (slot 1) */ #define CONFIG_PCIE2 /* PCIE controller 2 (slot 2) */ -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_LBA48 #define CONFIG_HWCONFIG diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 2293a2919e2..7bfa79059a0 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -29,8 +29,6 @@ #undef CONFIG_DM_MMC #endif -#define CONFIG_REMAKE_ELF - /* ENET Config */ /* ENET1 */ #if defined(CONFIG_CMD_NET) diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h index 568a93623db..f8555f6e48a 100644 --- a/include/configs/pogo_v4.h +++ b/include/configs/pogo_v4.h @@ -43,11 +43,6 @@ #endif /* - * SATA Driver configuration - */ -#define CONFIG_SYS_SATA_MAX_DEVICE 1 - -/* * Support large disk for SATA and USB */ #define CONFIG_SYS_64BIT_LBA diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h index 928ccb1e18a..30185b14b7a 100644 --- a/include/configs/presidio_asic.h +++ b/include/configs/presidio_asic.h @@ -8,8 +8,6 @@ #ifndef __PRESIDIO_ASIC_H #define __PRESIDIO_ASIC_H -#define CONFIG_REMAKE_ELF - #define CONFIG_SYS_INIT_SP_ADDR 0x00100000 #define CONFIG_SYS_BOOTM_LEN 0x00c00000 diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 52c33600b3c..e9dbd54517f 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -33,15 +33,6 @@ * - Only legacy IDE controller is supported for QEMU '-M pc' target * - AHCI controller is supported for QEMU '-M q35' target */ -#define CONFIG_SYS_IDE_MAXBUS 2 -#define CONFIG_SYS_IDE_MAXDEVICE 4 -#define CONFIG_SYS_ATA_BASE_ADDR 0 -#define CONFIG_SYS_ATA_DATA_OFFSET 0 -#define CONFIG_SYS_ATA_REG_OFFSET 0 -#define CONFIG_SYS_ATA_ALT_OFFSET 0 -#define CONFIG_SYS_ATA_IDE0_OFFSET 0x1f0 -#define CONFIG_SYS_ATA_IDE1_OFFSET 0x170 -#define CONFIG_ATAPI #define CONFIG_SPL_BOARD_LOAD_IMAGE diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index e3105fe53cb..04b34814805 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -30,19 +30,6 @@ #define CONFIG_SYS_PLL_SETTLING_TIME 100/* in us */ /* - * IDE support - */ -#define CONFIG_IDE_RESET 1 -#define CONFIG_SYS_PIO_MODE 1 -#define CONFIG_SYS_IDE_MAXBUS 1 /* IDE bus */ -#define CONFIG_SYS_IDE_MAXDEVICE 1 -#define CONFIG_SYS_ATA_BASE_ADDR 0xb4000000 -#define CONFIG_SYS_ATA_STRIDE 2 /* 1bit shift */ -#define CONFIG_SYS_ATA_DATA_OFFSET 0x1000 /* data reg offset */ -#define CONFIG_SYS_ATA_REG_OFFSET 0x1000 /* reg offset */ -#define CONFIG_SYS_ATA_ALT_OFFSET 0x800 /* alternate register offset */ - -/* * SuperH PCI Bridge Configration */ #define CONFIG_SH7751_PCI diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index eed21255eb2..07a30d0f2f0 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -11,8 +11,6 @@ #include <asm/arch/rmobile.h> -#define CONFIG_REMAKE_ELF - #ifdef CONFIG_SPL #define CONFIG_SPL_TARGET "spl/u-boot-spl.scif" #endif diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 9e0e8c7056f..75efbf34481 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -29,22 +29,4 @@ #define CONFIG_SANDBOX_SDL #endif -#ifndef CONFIG_SPL_BUILD -#define CONFIG_SYS_IDE_MAXBUS 1 -#define CONFIG_SYS_ATA_IDE0_OFFSET 0 -#define CONFIG_SYS_IDE_MAXDEVICE 2 -#define CONFIG_SYS_ATA_BASE_ADDR 0x100 -#define CONFIG_SYS_ATA_DATA_OFFSET 0 -#define CONFIG_SYS_ATA_REG_OFFSET 1 -#define CONFIG_SYS_ATA_ALT_OFFSET 2 -#define CONFIG_SYS_ATA_STRIDE 4 -#endif - -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_DEVICE 2 -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 8 -#define CONFIG_SYS_SCSI_MAX_LUN 4 - -#define CONFIG_SYS_SATA_MAX_DEVICE 2 - #endif diff --git a/include/configs/sfr_nb4_ser.h b/include/configs/sfr_nb4_ser.h index 7c88af0532d..5400d1256ee 100644 --- a/include/configs/sfr_nb4_ser.h +++ b/include/configs/sfr_nb4_ser.h @@ -6,4 +6,3 @@ #include <configs/bmips_common.h> #include <configs/bmips_bcm6358.h> -#define CONFIG_REMAKE_ELF diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 8dba4fcb4f8..4499a63aed2 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -46,7 +46,6 @@ * SATA driver configuration */ #ifdef CONFIG_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_LBA48 #endif /* CONFIG_SATA */ diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index 30adfe948f1..087764666bf 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -32,8 +32,6 @@ #define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4 - /* Environment options */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 8646dc23185..51dc2e41880 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -15,7 +15,6 @@ * U-Boot general configurations */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_REMAKE_ELF /* sysmgr.boot_scratch_cold4 & 5 (64bit) will be used for PSCI_CPU_ON call */ #define CPU_RELEASE_ADDR 0xFFD12210 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 58ccafc385a..065b406e2e7 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -40,7 +40,6 @@ /* SATA */ #ifdef CONFIG_CMD_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 3c942cc6fa0..14817b165cf 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -41,7 +41,6 @@ "initrd_high=0x10000000\0" /* SATA support */ -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_LBA48 /* Enable LCD and reserve 512KB from top of memory*/ diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 600689843bb..3d770f88bde 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -6,8 +6,6 @@ #ifndef __THUNDERX_88XX_H__ #define __THUNDERX_88XX_H__ -#define CONFIG_REMAKE_ELF - #define CONFIG_THUNDERX #define CONFIG_SYS_64BIT diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h index 9638ab2017b..0324b1e1b21 100644 --- a/include/configs/total_compute.h +++ b/include/configs/total_compute.h @@ -9,8 +9,6 @@ #ifndef __TOTAL_COMPUTE_H #define __TOTAL_COMPUTE_H -#define CONFIG_REMAKE_ELF - /* Link Definitions */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index 9bf5774a7f1..f0c5ceb3849 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -9,8 +9,6 @@ #include <linux/stringify.h> -#define CONFIG_REMAKE_ELF - /* Link Definitions */ #ifdef CONFIG_TARGET_VEXPRESS64_JUNO #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 051c18ca232..80e8fe1deb2 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -17,7 +17,6 @@ /* SATA Configs */ #ifdef CONFIG_CMD_SATA -#define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 #define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR #define CONFIG_LBA48 diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index 03539a41b49..bc72f5f35ff 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -10,8 +10,6 @@ #ifndef __XILINX_VERSAL_H #define __XILINX_VERSAL_H -#define CONFIG_REMAKE_ELF - /* #define CONFIG_ARMV8_SWITCH_TO_EL1 */ /* Generic Interrupt Controller Definitions */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index f791ab71c7c..e51d92ffe4e 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -10,8 +10,6 @@ #ifndef __XILINX_ZYNQMP_H #define __XILINX_ZYNQMP_H -#define CONFIG_REMAKE_ELF - /* #define CONFIG_ARMV8_SWITCH_TO_EL1 */ /* Generic Interrupt Controller Definitions */ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 1bda0a66904..780952cf5f6 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_ZYNQ_COMMON_H #define __CONFIG_ZYNQ_COMMON_H -#define CONFIG_REMAKE_ELF - /* Cache options */ #ifndef CONFIG_SYS_L2CACHE_OFF # define CONFIG_SYS_L2_PL310 |