ide: Convert some options to Kconfig
Subsystems (3)
cover ide: Convert some options to Kconfig
This converts some IDE options to use Kconfig, thus allowing the sandbox config.h file to shrink a little more.
It also drops some dead code.
Simon Glass (3):
ide: Drop CONFIG_IDE_AHB
Convert CONFIG_SYS_IDE_MAXBUS et al to Kconfig
Drop CONFIG_SYS_PIO_MODE
README | 19 ---- arch/arm/mach-kirkwood/include/mach/config.h | 7 -- configs/M5253DEMO_defconfig | 8 ++ configs/coreboot64_defconfig | 5 + configs/coreboot_defconfig | 5 + configs/dns325_defconfig | 4 + configs/dreamplug_defconfig | 4 + configs/ds109_defconfig | 4 + configs/edminiv2_defconfig | 8 ++ configs/efi-x86_payload32_defconfig | 5 + configs/efi-x86_payload64_defconfig | 5 + configs/guruplug_defconfig | 4 + configs/ib62x0_defconfig | 6 ++ configs/malta64_defconfig | 4 + configs/malta64el_defconfig | 4 + configs/malta_defconfig | 4 + configs/maltael_defconfig | 4 + configs/nas220_defconfig | 4 + configs/openrd_base_defconfig | 6 ++ configs/openrd_client_defconfig | 6 ++ configs/openrd_ultimate_defconfig | 6 ++ configs/qemu-x86_64_defconfig | 5 + configs/qemu-x86_defconfig | 5 + configs/r2dplus_defconfig | 8 ++ configs/sandbox64_defconfig | 7 ++ configs/sandbox_defconfig | 7 ++ configs/sandbox_noinst_defconfig | 7 ++ configs/sandbox_spl_defconfig | 7 ++ drivers/block/Kconfig | 104 +++++++++++++++++++ drivers/block/ide.c | 22 ---- include/ata.h | 3 - include/configs/M5253DEMO.h | 13 --- include/configs/coreboot.h | 9 -- include/configs/edminiv2.h | 8 -- include/configs/efi-x86_payload.h | 9 -- include/configs/ib62x0.h | 2 - include/configs/lacie_kw.h | 2 - include/configs/malta.h | 6 -- include/configs/openrd.h | 4 - include/configs/qemu-x86.h | 9 -- include/configs/r2dplus.h | 13 --- include/configs/sandbox.h | 11 -- include/ide.h | 7 -- scripts/config_whitelist.txt | 12 --- 44 files changed, 246 insertions(+), 156 deletions(-)
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
PATCH 1/3 ide: Drop CONFIG_IDE_AHB
This is not used in U-Boot anymore. Drop it.
---
README | 8 -------- drivers/block/ide.c | 22 ---------------------- include/ide.h | 7 ------- 3 files changed, 37 deletions(-)
README +0 -8
@@ -2393,14 +2393,6 @@ Low Level (hardware related) configuration options: If this macro is defined, then CONFIG_SYS_CCSRBAR_PHYS will be forced to a value that ensures that CCSR is not relocated. -- CONFIG_IDE_AHB: - Most IDE controllers were designed to be connected with PCI - interface. Only few of them were designed for AHB interface. - When software is doing ATA command and data transfer to - IDE devices through IDE-AHB controller, some additional - registers accessing to these kind of IDE-AHB controller - is required. - - CONFIG_SYS_IMMR: Physical address of the Internal Memory. DO NOT CHANGE unless you know exactly what you're doing! (11-4) [MPC8xx systems only]
drivers/block/ide.c +0 -22
@@ -676,28 +676,14 @@ __weak void ide_outb(int dev, int port, unsigned char val)debug ("ide_outb (dev= %d, port= 0x%x, val= 0x%02x) : @ 0x%08lx\n" , dev, port, val,ATA_CURR_BASE (dev) + port); -#if defined(CONFIG_IDE_AHB ) -if (port) { -/* write command */ -ide_write_register (dev, port, val); - }else { -/* write data */ -outb (val, (ATA_CURR_BASE (dev))); - } -#else outb (val,ATA_CURR_BASE (dev) + port); -#endif }__weak unsigned char ide_inb (int dev,int port) {uchar val; -#if defined(CONFIG_IDE_AHB ) - val =ide_read_register (dev, port); -#else val =inb (ATA_CURR_BASE (dev) + port); -#endif debug ("ide_inb (dev= %d, port= 0x%x) : @ 0x%08lx -> 0x%02x\n" , dev, port,ATA_CURR_BASE (dev) + port, val);
@@ -824,9 +810,6 @@ __weak void ide_input_swap_data(int dev, ulong *sect_buf, int words)__weak void ide_output_data (int dev,const ulong *sect_buf,int words) { -#if defined(CONFIG_IDE_AHB ) -ide_write_data (dev, sect_buf, words); -#else uintptr_t paddr = (ATA_CURR_BASE (dev) +ATA_DATA_REG );ushort *dbuf;
@@ -837,14 +820,10 @@ __weak void ide_output_data(int dev, const ulong *sect_buf, int words)EIEIO ;outw (cpu_to_le16 (*dbuf++), paddr); } -#endif /* CONFIG_IDE_AHB */ }__weak void ide_input_data (int dev,ulong *sect_buf,int words) { -#if defined(CONFIG_IDE_AHB ) -ide_read_data (dev, sect_buf, words); -#else uintptr_t paddr = (ATA_CURR_BASE (dev) +ATA_DATA_REG );ushort *dbuf;
@@ -858,7 +837,6 @@ __weak void ide_input_data(int dev, ulong *sect_buf, int words)EIEIO ; *dbuf++ =le16_to_cpu (inw (paddr)); } -#endif /* CONFIG_IDE_AHB */ }#ifdef CONFIG_BLK
include/ide.h +0 -7
@@ -41,13 +41,6 @@ int ide_preinit(void);int ide_device_present (int dev);#endif -#if defined(CONFIG_IDE_AHB ) -unsigned char ide_read_register (int dev,unsigned int port); -void ide_write_register (int dev,unsigned int port,unsigned char val); -void ide_read_data (int dev,ulong *sect_buf,int words); -void ide_write_data (int dev,const ulong *sect_buf,int words); -#endif -/* * I/O function overrides */
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
Re: [PATCH 1/3] ide: Drop CONFIG_IDE_AHB
Quoted 3 lines · Simon Glass
This is not used in U-Boot anymore. Drop it.
Signed-off-by Simon Glass <[email protected]>
Thanks,
Stefan
Quoted 101 lines
---
README | 8 -------- drivers/block/ide.c | 22 ---------------------- include/ide.h | 7 ------- 3 files changed, 37 deletions(-)README +0
-8@@ -2393,14 +2393,6 @@ Low Level (hardware related) configuration options: If this macro is defined, then CONFIG_SYS_CCSRBAR_PHYS will be forced to a value that ensures that CCSR is not relocated. -- CONFIG_IDE_AHB: - Most IDE controllers were designed to be connected with PCI - interface. Only few of them were designed for AHB interface. - When software is doing ATA command and data transfer to - IDE devices through IDE-AHB controller, some additional - registers accessing to these kind of IDE-AHB controller - is required. - - CONFIG_SYS_IMMR: Physical address of the Internal Memory. DO NOT CHANGE unless you know exactly what you're doing! (11-4) [MPC8xx systems only]drivers/block/ide.c +0
-22@@ -676,28 +676,14 @@ __weak void ide_outb(int dev, int port, unsigned char val)debug ("ide_outb (dev= %d, port= 0x%x, val= 0x%02x) : @ 0x%08lx\n" , dev, port, val,ATA_CURR_BASE (dev) + port); -#if defined(CONFIG_IDE_AHB ) -if (port) { -/* write command */ -ide_write_register (dev, port, val); - }else { -/* write data */ -outb (val, (ATA_CURR_BASE (dev))); - } -#else outb (val,ATA_CURR_BASE (dev) + port); -#endif }__weak unsigned char ide_inb (int dev,int port) {uchar val; -#if defined(CONFIG_IDE_AHB ) - val =ide_read_register (dev, port); -#else val =inb (ATA_CURR_BASE (dev) + port); -#endif debug ("ide_inb (dev= %d, port= 0x%x) : @ 0x%08lx -> 0x%02x\n" , dev, port,ATA_CURR_BASE (dev) + port, val);@@ -824,9 +810,6 @@ __weak void ide_input_swap_data(int dev, ulong *sect_buf, int words)__weak void ide_output_data (int dev,const ulong *sect_buf,int words) { -#if defined(CONFIG_IDE_AHB ) -ide_write_data (dev, sect_buf, words); -#else uintptr_t paddr = (ATA_CURR_BASE (dev) +ATA_DATA_REG );ushort *dbuf;@@ -837,14 +820,10 @@ __weak void ide_output_data(int dev, const ulong *sect_buf, int words)EIEIO ;outw (cpu_to_le16 (*dbuf++), paddr); } -#endif /* CONFIG_IDE_AHB */ }__weak void ide_input_data (int dev,ulong *sect_buf,int words) { -#if defined(CONFIG_IDE_AHB ) -ide_read_data (dev, sect_buf, words); -#else uintptr_t paddr = (ATA_CURR_BASE (dev) +ATA_DATA_REG );ushort *dbuf;@@ -858,7 +837,6 @@ __weak void ide_input_data(int dev, ulong *sect_buf, int words)EIEIO ; *dbuf++ =le16_to_cpu (inw (paddr)); } -#endif /* CONFIG_IDE_AHB */ }#ifdef CONFIG_BLK include/ide.h +0
-0@@ -41,13 +41,6 @@ int ide_preinit(void);int ide_device_present (int dev);#endif
include/ide.h int ide_preinit(void); · line 46
Quoted 10 lines
include/ide.h +0
-7-#if defined(CONFIG_IDE_AHB ) -unsigned char ide_read_register (int dev,unsigned int port); -void ide_write_register (int dev,unsigned int port,unsigned char val); -void ide_read_data (int dev,ulong *sect_buf,int words); -void ide_write_data (int dev,const ulong *sect_buf,int words); -#endif -/* * I/O function overrides */
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 1/3] ide: Drop CONFIG_IDE_AHB
In reply to Simon GlassQuoted 4 lines · Simon Glass
This is not used in U-Boot anymore. Drop it.
Signed-off-by Simon Glass <[email protected]>Reviewed-by Stefan Roese <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 2/3 Convert CONFIG_SYS_IDE_MAXBUS et al to Kconfig
In reply to Simon GlassThis converts the following to Kconfig:
CONFIG_SYS_IDE_MAXBUS
CONFIG_SYS_IDE_MAXDEVICE
CONFIG_SYS_ATA_BASE_ADDR
CONFIG_SYS_ATA_STRIDE
CONFIG_SYS_ATA_DATA_OFFSET
CONFIG_SYS_ATA_REG_OFFSET
CONFIG_SYS_ATA_ALT_OFFSET
CONFIG_SYS_ATA_IDE0_OFFSET
CONFIG_SYS_ATA_IDE1_OFFSET
CONFIG_ATAPI
CONFIG_IDE_RESET
---
README | 11 -- arch/arm/mach-kirkwood/include/mach/config.h | 7 -- configs/M5253DEMO_defconfig | 8 ++ configs/coreboot64_defconfig | 5 + configs/coreboot_defconfig | 5 + configs/dns325_defconfig | 4 + configs/dreamplug_defconfig | 4 + configs/ds109_defconfig | 4 + configs/edminiv2_defconfig | 8 ++ configs/efi-x86_payload32_defconfig | 5 + configs/efi-x86_payload64_defconfig | 5 + configs/guruplug_defconfig | 4 + configs/ib62x0_defconfig | 6 ++ configs/malta64_defconfig | 4 + configs/malta64el_defconfig | 4 + configs/malta_defconfig | 4 + configs/maltael_defconfig | 4 + configs/nas220_defconfig | 4 + configs/openrd_base_defconfig | 6 ++ configs/openrd_client_defconfig | 6 ++ configs/openrd_ultimate_defconfig | 6 ++ configs/qemu-x86_64_defconfig | 5 + configs/qemu-x86_defconfig | 5 + configs/r2dplus_defconfig | 8 ++ configs/sandbox64_defconfig | 7 ++ configs/sandbox_defconfig | 7 ++ configs/sandbox_noinst_defconfig | 7 ++ configs/sandbox_spl_defconfig | 7 ++ drivers/block/Kconfig | 104 +++++++++++++++++++ include/ata.h | 3 - include/configs/M5253DEMO.h | 13 --- include/configs/coreboot.h | 9 -- include/configs/edminiv2.h | 8 -- include/configs/efi-x86_payload.h | 9 -- include/configs/ib62x0.h | 2 - include/configs/lacie_kw.h | 2 - include/configs/malta.h | 6 -- include/configs/openrd.h | 4 - include/configs/qemu-x86.h | 9 -- include/configs/r2dplus.h | 8 -- include/configs/sandbox.h | 11 -- scripts/config_whitelist.txt | 11 -- 42 files changed, 246 insertions(+), 113 deletions(-)
README +0 -11
@@ -720,17 +720,6 @@ The following options need to be configured: CONFIG_SCSI) you must configure support for at least one non-MTD partition type as well. -- IDE Reset method: - CONFIG_IDE_RESET - is this is defined, IDE Reset will - be performed by calling the function - ide_set_reset(int reset) - which has to be defined in a board specific file - -- ATAPI Support: - CONFIG_ATAPI - - Set this to enable ATAPI support. - - LBA48 Support CONFIG_LBA48
arch/arm/mach-kirkwood/include/mach/config.h +0 -7
@@ -59,18 +59,11 @@#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 /* CONFIG_IDE requires some #defines for ATA registers */ -#define CONFIG_SYS_IDE_MAXBUS 2 -#define CONFIG_SYS_IDE_MAXDEVICE 2/* ATA registers base is at SATA controller base */ -#define CONFIG_SYS_ATA_BASE_ADDR MV_SATA_BASE#endif /* CONFIG_IDE */ /* Use common timer */
configs/M5253DEMO_defconfig +8 -0
@@ -20,6 +20,14 @@ CONFIG_CMD_FAT=y CONFIG_MAC_PARTITION=y CONFIG_ENV_ADDR=0xFF804000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0xA0 +CONFIG_SYS_ATA_REG_OFFSET=0xA0 +CONFIG_SYS_ATA_ALT_OFFSET=0xC0 +CONFIG_SYS_ATA_IDE0_OFFSET=0 +CONFIG_ATAPI=y +CONFIG_IDE_RESET=y CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_FSL=y CONFIG_SYS_FSL_I2C_OFFSET=0x280
configs/coreboot64_defconfig +5 -0
@@ -46,6 +46,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_TFTP_TSIZE=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SYS_IDE_MAXDEVICE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_ALT_OFFSET=0 +CONFIG_ATAPI=y # CONFIG_PCI_PNP is not set CONFIG_SOUND=y CONFIG_SOUND_I8254=y
configs/coreboot_defconfig +5 -0
@@ -41,6 +41,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_TFTP_TSIZE=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SYS_IDE_MAXDEVICE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_ALT_OFFSET=0 +CONFIG_ATAPI=y # CONFIG_PCI_PNP is not set CONFIG_SOUND=y CONFIG_SOUND_I8254=y
configs/dns325_defconfig +4 -0
@@ -41,6 +41,10 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 CONFIG_KIRKWOOD_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y
configs/dreamplug_defconfig +4 -0
@@ -41,6 +41,10 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA_MV=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_DM_SPI_FLASH=y
configs/ds109_defconfig +4 -0
@@ -39,6 +39,10 @@ CONFIG_ENV_SPI_MAX_HZ=50000000 CONFIG_ENV_ADDR=0x3D0000 CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 CONFIG_DM_I2C=y CONFIG_SYS_I2C_MVTWSI=y # CONFIG_MMC is not set
configs/edminiv2_defconfig +8 -0
@@ -33,6 +33,14 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xFFF84000 CONFIG_NETCONSOLE=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_IDE_MAXDEVICE=1 +CONFIG_SYS_ATA_BASE_ADDR=0xf1080000 +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 +CONFIG_SYS_ATA_IDE0_OFFSET=0x4000 CONFIG_SYS_I2C_LEGACY=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_MVTWSI=y
configs/efi-x86_payload32_defconfig +5 -0
@@ -39,6 +39,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_TFTP_TSIZE=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SYS_IDE_MAXDEVICE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_ALT_OFFSET=0 +CONFIG_ATAPI=y # CONFIG_PCI_PNP is not set # CONFIG_GZIP is not set CONFIG_EFI=y
configs/efi-x86_payload64_defconfig +5 -0
@@ -39,6 +39,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_TFTP_TSIZE=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SYS_IDE_MAXDEVICE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_ALT_OFFSET=0 +CONFIG_ATAPI=y # CONFIG_PCI_PNP is not set # CONFIG_GZIP is not set CONFIG_EFI=y
configs/guruplug_defconfig +4 -0
@@ -43,6 +43,10 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y
configs/ib62x0_defconfig +6 -0
@@ -42,6 +42,12 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 +CONFIG_SYS_ATA_IDE0_OFFSET=0x2000 +CONFIG_SYS_ATA_IDE1_OFFSET=0x4000 # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y
configs/malta64_defconfig +4 -0
@@ -25,6 +25,10 @@ CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xFFFFFFFFBE3E0000 +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_IDE0_OFFSET=0x01f0 CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/malta64el_defconfig +4 -0
@@ -27,6 +27,10 @@ CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xFFFFFFFFBE3E0000 +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_IDE0_OFFSET=0x01f0 CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/malta_defconfig +4 -0
@@ -24,6 +24,10 @@ CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xBE3E0000 +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_IDE0_OFFSET=0x01f0 CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/maltael_defconfig +4 -0
@@ -26,6 +26,10 @@ CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xBE3E0000 +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_IDE0_OFFSET=0x01f0 CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
configs/nas220_defconfig +4 -0
@@ -42,6 +42,10 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 CONFIG_KIRKWOOD_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=y
configs/openrd_base_defconfig +6 -0
@@ -43,6 +43,12 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 +CONFIG_SYS_ATA_IDE0_OFFSET=0x2000 +CONFIG_SYS_ATA_IDE1_OFFSET=0x4000 # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y
configs/openrd_client_defconfig +6 -0
@@ -44,6 +44,12 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 +CONFIG_SYS_ATA_IDE0_OFFSET=0x2000 +CONFIG_SYS_ATA_IDE1_OFFSET=0x4000 # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y
configs/openrd_ultimate_defconfig +6 -0
@@ -44,6 +44,12 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 +CONFIG_SYS_ATA_IDE0_OFFSET=0x2000 +CONFIG_SYS_ATA_IDE1_OFFSET=0x4000 # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=y
configs/qemu-x86_64_defconfig +5 -0
@@ -55,6 +55,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_TFTP_TSIZE=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SYS_IDE_MAXDEVICE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_ALT_OFFSET=0 +CONFIG_ATAPI=y CONFIG_CPU=y CONFIG_NVME=y CONFIG_SPL_DM_RTC=y
configs/qemu-x86_defconfig +5 -0
@@ -38,6 +38,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_TFTP_TSIZE=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SYS_IDE_MAXDEVICE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_ALT_OFFSET=0 +CONFIG_ATAPI=y CONFIG_CPU=y CONFIG_NVME=y CONFIG_SPI=y
configs/r2dplus_defconfig +8 -0
@@ -29,6 +29,14 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xA0040000 CONFIG_DM=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_IDE_MAXDEVICE=1 +CONFIG_SYS_ATA_BASE_ADDR=0xb4000000 +CONFIG_SYS_ATA_STRIDE=2 +CONFIG_SYS_ATA_DATA_OFFSET=0x1000 +CONFIG_SYS_ATA_REG_OFFSET=0x1000 +CONFIG_SYS_ATA_ALT_OFFSET=0x800 +CONFIG_IDE_RESET=y CONFIG_CLK=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y
configs/sandbox64_defconfig +7 -0
@@ -106,6 +106,13 @@ CONFIG_ADC=y CONFIG_ADC_SANDBOX=y CONFIG_AXI=y CONFIG_AXI_SANDBOX=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_BASE_ADDR=0x100 +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=1 +CONFIG_SYS_ATA_ALT_OFFSET=2 +CONFIG_SYS_ATA_IDE0_OFFSET=0 CONFIG_BUTTON=y CONFIG_BUTTON_GPIO=y CONFIG_CLK=y
configs/sandbox_defconfig +7 -0
@@ -130,6 +130,13 @@ CONFIG_ADC=y CONFIG_ADC_SANDBOX=y CONFIG_AXI=y CONFIG_AXI_SANDBOX=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_BASE_ADDR=0x100 +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=1 +CONFIG_SYS_ATA_ALT_OFFSET=2 +CONFIG_SYS_ATA_IDE0_OFFSET=0 CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DM_BOOTCOUNT=y CONFIG_DM_BOOTCOUNT_RTC=y
configs/sandbox_noinst_defconfig +7 -0
@@ -110,6 +110,13 @@ CONFIG_ADC=y CONFIG_ADC_SANDBOX=y CONFIG_AXI=y CONFIG_AXI_SANDBOX=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_BASE_ADDR=0x100 +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=1 +CONFIG_SYS_ATA_ALT_OFFSET=2 +CONFIG_SYS_ATA_IDE0_OFFSET=0 CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_CPU=y
configs/sandbox_spl_defconfig +7 -0
@@ -112,6 +112,13 @@ CONFIG_ADC=y CONFIG_ADC_SANDBOX=y CONFIG_AXI=y CONFIG_AXI_SANDBOX=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_BASE_ADDR=0x100 +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=1 +CONFIG_SYS_ATA_ALT_OFFSET=2 +CONFIG_SYS_ATA_IDE0_OFFSET=0 CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_CPU=y
drivers/block/Kconfig +104 -0
107 lines not on this page · raw message
include/ata.h +0 -3
@@ -19,9 +19,6 @@* 8-bit (register) and 16-bit (data) accesses might use different * address spaces. This is implemented by the following definitions. */ -#ifndef CONFIG_SYS_ATA_STRIDE -#define CONFIG_SYS_ATA_STRIDE 1 -#endif #define ATA_IO_DATA (x) (CONFIG_SYS_ATA_DATA_OFFSET+((x) * CONFIG_SYS_ATA_STRIDE))#define ATA_IO_REG (x) (CONFIG_SYS_ATA_REG_OFFSET +((x) * CONFIG_SYS_ATA_STRIDE))
include/configs/M5253DEMO.h +0 -13
@@ -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
include/configs/coreboot.h +0 -9
@@ -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 */
include/configs/edminiv2.h +0 -8
@@ -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 */
include/configs/efi-x86_payload.h +0 -9
@@ -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 */
include/configs/ib62x0.h +0 -2
@@ -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 */
include/configs/lacie_kw.h +0 -2
@@ -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
include/configs/malta.h +0 -6
@@ -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
include/configs/openrd.h +0 -4
@@ -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 */
include/configs/qemu-x86.h +0 -9
@@ -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
include/configs/r2dplus.h +0 -8
@@ -32,15 +32,7 @@/* * 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
include/configs/sandbox.h +0 -11
@@ -29,17 +29,6 @@#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
scripts/config_whitelist.txt +0 -11
@@ -21,7 +21,6 @@ CONFIG_AT91SAM9M10G45EK CONFIG_AT91_GPIO_PULLUP CONFIG_AT91_LED CONFIG_AT91_WANTS_COMMON_PHY -CONFIG_ATAPI CONFIG_ATMEL_LCD CONFIG_ATMEL_LCD_BGR555 CONFIG_ATMEL_LCD_RGB565
@@ -441,7 +440,6 @@ CONFIG_I2C_RTC_ADDR CONFIG_ICACHE CONFIG_ICS307_REFCLK_HZ CONFIG_IDE_PREINIT -CONFIG_IDE_RESET CONFIG_IMX CONFIG_IMX6_PWM_PER_CLK CONFIG_IMX_HDMI
@@ -846,13 +844,6 @@ CONFIG_SYS_AT91_MAIN_CLOCK CONFIG_SYS_AT91_PLLA CONFIG_SYS_AT91_PLLB CONFIG_SYS_AT91_SLOW_CLOCK -CONFIG_SYS_ATA_ALT_OFFSET -CONFIG_SYS_ATA_BASE_ADDR -CONFIG_SYS_ATA_DATA_OFFSET -CONFIG_SYS_ATA_IDE0_OFFSET -CONFIG_SYS_ATA_IDE1_OFFSET -CONFIG_SYS_ATA_REG_OFFSET -CONFIG_SYS_ATA_STRIDE CONFIG_SYS_AUTOLOAD CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION CONFIG_SYS_AUXCORE_BOOTDATA
@@ -1418,8 +1409,6 @@ CONFIG_SYS_I2C_RTC_ADDR CONFIG_SYS_I2C_TCA642X_ADDR CONFIG_SYS_I2C_TCA642X_BUS_NUM CONFIG_SYS_ICACHE_INV -CONFIG_SYS_IDE_MAXBUS -CONFIG_SYS_IDE_MAXDEVICE CONFIG_SYS_IFC_ADDR CONFIG_SYS_IFC_CCR CONFIG_SYS_INIT_DBCR
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
Re: [PATCH 2/3] Convert CONFIG_SYS_IDE_MAXBUS et al to Kconfig
Quoted 13 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_SYS_IDE_MAXBUS
CONFIG_SYS_IDE_MAXDEVICE
CONFIG_SYS_ATA_BASE_ADDR
CONFIG_SYS_ATA_STRIDE
CONFIG_SYS_ATA_DATA_OFFSET
CONFIG_SYS_ATA_REG_OFFSET
CONFIG_SYS_ATA_ALT_OFFSET
CONFIG_SYS_ATA_IDE0_OFFSET
CONFIG_SYS_ATA_IDE1_OFFSET
CONFIG_ATAPI
CONFIG_IDE_RESET
Quoted 1 line
Signed-off-by Simon Glass <[email protected]>
Thanks,
Stefan
Quoted 889 lines
---
README | 11 -- arch/arm/mach-kirkwood/include/mach/config.h | 7 -- configs/M5253DEMO_defconfig | 8 ++ configs/coreboot64_defconfig | 5 + configs/coreboot_defconfig | 5 + configs/dns325_defconfig | 4 + configs/dreamplug_defconfig | 4 + configs/ds109_defconfig | 4 + configs/edminiv2_defconfig | 8 ++ configs/efi-x86_payload32_defconfig | 5 + configs/efi-x86_payload64_defconfig | 5 + configs/guruplug_defconfig | 4 + configs/ib62x0_defconfig | 6 ++ configs/malta64_defconfig | 4 + configs/malta64el_defconfig | 4 + configs/malta_defconfig | 4 + configs/maltael_defconfig | 4 + configs/nas220_defconfig | 4 + configs/openrd_base_defconfig | 6 ++ configs/openrd_client_defconfig | 6 ++ configs/openrd_ultimate_defconfig | 6 ++ configs/qemu-x86_64_defconfig | 5 + configs/qemu-x86_defconfig | 5 + configs/r2dplus_defconfig | 8 ++ configs/sandbox64_defconfig | 7 ++ configs/sandbox_defconfig | 7 ++ configs/sandbox_noinst_defconfig | 7 ++ configs/sandbox_spl_defconfig | 7 ++ drivers/block/Kconfig | 104 +++++++++++++++++++ include/ata.h | 3 - include/configs/M5253DEMO.h | 13 --- include/configs/coreboot.h | 9 -- include/configs/edminiv2.h | 8 -- include/configs/efi-x86_payload.h | 9 -- include/configs/ib62x0.h | 2 - include/configs/lacie_kw.h | 2 - include/configs/malta.h | 6 -- include/configs/openrd.h | 4 - include/configs/qemu-x86.h | 9 -- include/configs/r2dplus.h | 8 -- include/configs/sandbox.h | 11 -- scripts/config_whitelist.txt | 11 -- 42 files changed, 246 insertions(+), 113 deletions(-)README +0
-11@@ -720,17 +720,6 @@ The following options need to be configured: CONFIG_SCSI) you must configure support for at least one non-MTD partition type as well. -- IDE Reset method: - CONFIG_IDE_RESET - is this is defined, IDE Reset will - be performed by calling the function - ide_set_reset(int reset) - which has to be defined in a board specific file - -- ATAPI Support: - CONFIG_ATAPI - - Set this to enable ATAPI support. - - LBA48 Support CONFIG_LBA48arch/arm/mach-kirkwood/include/mach/config.h +0
-7@@ -59,18 +59,11 @@#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 /* CONFIG_IDE requires some #defines for ATA registers */ -#define CONFIG_SYS_IDE_MAXBUS 2 -#define CONFIG_SYS_IDE_MAXDEVICE 2/* ATA registers base is at SATA controller base */ -#define CONFIG_SYS_ATA_BASE_ADDR MV_SATA_BASE#endif /* CONFIG_IDE */ /* Use common timer */ configs/M5253DEMO_defconfig +8
-0@@ -20,6 +20,14 @@ CONFIG_CMD_FAT=y CONFIG_MAC_PARTITION=y CONFIG_ENV_ADDR=0xFF804000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0xA0 +CONFIG_SYS_ATA_REG_OFFSET=0xA0 +CONFIG_SYS_ATA_ALT_OFFSET=0xC0 +CONFIG_SYS_ATA_IDE0_OFFSET=0 +CONFIG_ATAPI=y +CONFIG_IDE_RESET=y CONFIG_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_FSL=y CONFIG_SYS_FSL_I2C_OFFSET=0x280configs/coreboot64_defconfig +5
-0@@ -46,6 +46,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_TFTP_TSIZE=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SYS_IDE_MAXDEVICE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_ALT_OFFSET=0 +CONFIG_ATAPI=y # CONFIG_PCI_PNP is not set CONFIG_SOUND=y CONFIG_SOUND_I8254=yconfigs/coreboot_defconfig +5
-0@@ -41,6 +41,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_TFTP_TSIZE=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SYS_IDE_MAXDEVICE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_ALT_OFFSET=0 +CONFIG_ATAPI=y # CONFIG_PCI_PNP is not set CONFIG_SOUND=y CONFIG_SOUND_I8254=yconfigs/dns325_defconfig +4
-0@@ -41,6 +41,10 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 CONFIG_KIRKWOOD_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=yconfigs/dreamplug_defconfig +4
-0@@ -41,6 +41,10 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SATA_MV=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_DM_SPI_FLASH=yconfigs/ds109_defconfig +4
-0@@ -39,6 +39,10 @@ CONFIG_ENV_SPI_MAX_HZ=50000000 CONFIG_ENV_ADDR=0x3D0000 CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 CONFIG_DM_I2C=y CONFIG_SYS_I2C_MVTWSI=y # CONFIG_MMC is not setconfigs/edminiv2_defconfig +8
-0@@ -33,6 +33,14 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xFFF84000 CONFIG_NETCONSOLE=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_IDE_MAXDEVICE=1 +CONFIG_SYS_ATA_BASE_ADDR=0xf1080000 +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 +CONFIG_SYS_ATA_IDE0_OFFSET=0x4000 CONFIG_SYS_I2C_LEGACY=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_MVTWSI=yconfigs/efi-x86_payload32_defconfig +5
-0@@ -39,6 +39,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_TFTP_TSIZE=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SYS_IDE_MAXDEVICE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_ALT_OFFSET=0 +CONFIG_ATAPI=y # CONFIG_PCI_PNP is not set # CONFIG_GZIP is not set CONFIG_EFI=yconfigs/efi-x86_payload64_defconfig +5
-0@@ -39,6 +39,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_TFTP_TSIZE=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SYS_IDE_MAXDEVICE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_ALT_OFFSET=0 +CONFIG_ATAPI=y # CONFIG_PCI_PNP is not set # CONFIG_GZIP is not set CONFIG_EFI=yconfigs/guruplug_defconfig +4
-0@@ -43,6 +43,10 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=yconfigs/ib62x0_defconfig +6
-0@@ -42,6 +42,12 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 +CONFIG_SYS_ATA_IDE0_OFFSET=0x2000 +CONFIG_SYS_ATA_IDE1_OFFSET=0x4000 # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=yconfigs/malta64_defconfig +4
-0@@ -25,6 +25,10 @@ CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xFFFFFFFFBE3E0000 +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_IDE0_OFFSET=0x01f0 CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=yconfigs/malta64el_defconfig +4
-0@@ -27,6 +27,10 @@ CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xFFFFFFFFBE3E0000 +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_IDE0_OFFSET=0x01f0 CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=yconfigs/malta_defconfig +4
-0@@ -24,6 +24,10 @@ CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xBE3E0000 +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_IDE0_OFFSET=0x01f0 CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=yconfigs/maltael_defconfig +4
-0@@ -26,6 +26,10 @@ CONFIG_CMD_DATE=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xBE3E0000 +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_IDE0_OFFSET=0x01f0 CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=yconfigs/nas220_defconfig +4
-0@@ -42,6 +42,10 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 CONFIG_KIRKWOOD_GPIO=y # CONFIG_MMC is not set CONFIG_MTD=yconfigs/openrd_base_defconfig +6
-0@@ -43,6 +43,12 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 +CONFIG_SYS_ATA_IDE0_OFFSET=0x2000 +CONFIG_SYS_ATA_IDE1_OFFSET=0x4000 # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=yconfigs/openrd_client_defconfig +6
-0@@ -44,6 +44,12 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 +CONFIG_SYS_ATA_IDE0_OFFSET=0x2000 +CONFIG_SYS_ATA_IDE1_OFFSET=0x4000 # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=yconfigs/openrd_ultimate_defconfig +6
-0@@ -44,6 +44,12 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NETCONSOLE=y CONFIG_DM=y +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0x100 +CONFIG_SYS_ATA_REG_OFFSET=0x100 +CONFIG_SYS_ATA_ALT_OFFSET=0x100 +CONFIG_SYS_ATA_IDE0_OFFSET=0x2000 +CONFIG_SYS_ATA_IDE1_OFFSET=0x4000 # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_MTD=y CONFIG_MTD_RAW_NAND=yconfigs/qemu-x86_64_defconfig +5
-0@@ -55,6 +55,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_TFTP_TSIZE=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SYS_IDE_MAXDEVICE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_ALT_OFFSET=0 +CONFIG_ATAPI=y CONFIG_CPU=y CONFIG_NVME=y CONFIG_SPL_DM_RTC=yconfigs/qemu-x86_defconfig +5
-0@@ -38,6 +38,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_TFTP_TSIZE=y CONFIG_REGMAP=y CONFIG_SYSCON=y +CONFIG_SYS_IDE_MAXDEVICE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=0 +CONFIG_SYS_ATA_ALT_OFFSET=0 +CONFIG_ATAPI=y CONFIG_CPU=y CONFIG_NVME=y CONFIG_SPI=yconfigs/r2dplus_defconfig +8
-0@@ -29,6 +29,14 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xA0040000 CONFIG_DM=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_IDE_MAXDEVICE=1 +CONFIG_SYS_ATA_BASE_ADDR=0xb4000000 +CONFIG_SYS_ATA_STRIDE=2 +CONFIG_SYS_ATA_DATA_OFFSET=0x1000 +CONFIG_SYS_ATA_REG_OFFSET=0x1000 +CONFIG_SYS_ATA_ALT_OFFSET=0x800 +CONFIG_IDE_RESET=y CONFIG_CLK=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=yconfigs/sandbox64_defconfig +7
-0@@ -106,6 +106,13 @@ CONFIG_ADC=y CONFIG_ADC_SANDBOX=y CONFIG_AXI=y CONFIG_AXI_SANDBOX=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_BASE_ADDR=0x100 +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=1 +CONFIG_SYS_ATA_ALT_OFFSET=2 +CONFIG_SYS_ATA_IDE0_OFFSET=0 CONFIG_BUTTON=y CONFIG_BUTTON_GPIO=y CONFIG_CLK=yconfigs/sandbox_defconfig +7
-0@@ -130,6 +130,13 @@ CONFIG_ADC=y CONFIG_ADC_SANDBOX=y CONFIG_AXI=y CONFIG_AXI_SANDBOX=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_BASE_ADDR=0x100 +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=1 +CONFIG_SYS_ATA_ALT_OFFSET=2 +CONFIG_SYS_ATA_IDE0_OFFSET=0 CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DM_BOOTCOUNT=y CONFIG_DM_BOOTCOUNT_RTC=yconfigs/sandbox_noinst_defconfig +7
-0@@ -110,6 +110,13 @@ CONFIG_ADC=y CONFIG_ADC_SANDBOX=y CONFIG_AXI=y CONFIG_AXI_SANDBOX=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_BASE_ADDR=0x100 +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=1 +CONFIG_SYS_ATA_ALT_OFFSET=2 +CONFIG_SYS_ATA_IDE0_OFFSET=0 CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_CPU=yconfigs/sandbox_spl_defconfig +7
-0@@ -112,6 +112,13 @@ CONFIG_ADC=y CONFIG_ADC_SANDBOX=y CONFIG_AXI=y CONFIG_AXI_SANDBOX=y +CONFIG_SYS_IDE_MAXBUS=1 +CONFIG_SYS_ATA_BASE_ADDR=0x100 +CONFIG_SYS_ATA_STRIDE=4 +CONFIG_SYS_ATA_DATA_OFFSET=0 +CONFIG_SYS_ATA_REG_OFFSET=1 +CONFIG_SYS_ATA_ALT_OFFSET=2 +CONFIG_SYS_ATA_IDE0_OFFSET=0 CONFIG_CLK=y CONFIG_SPL_CLK=y CONFIG_CPU=ydrivers/block/Kconfig +104
-0@@ -102,3 +102,107 @@ config IDE This allows access to raw blocks and filesystems on an IDE drive from U-Boot. See also CMD_IDE which provides an 'ide' command for performing various IDE operations. + +if IDE + +config SYS_IDE_MAXBUS + hex "Maximumm number of IDE buses" + default 2 + help + This is the number of IDE buses provided by the board. Each one + can have one or two devices. One is designated the master and the + other one the slave. It is not required to have one or both on any + controller. + +config SYS_IDE_MAXDEVICE + hex "Maximum number of IDE devices" + default 2 + help + This is the number of IDE devices which can be connected to the + board. Normally this is 2 * CONFIG_SYS_IDE_MAXBUS since up to two + devices can be connected to each bus. The number of devices actually + connected is determined by probing. + +config SYS_ATA_BASE_ADDR + hex "Base address of IDE controller" + default 0 + help + This is the address of the IDE controller, from which other addresses + are calculated. Each bus is at a fixed offset from this address, + so it assumed that they are in the same area of the I/O space or + memory. + +config SYS_ATA_STRIDE + hex "IDE port stride" + default 0x1 + help + This is the distance between each IDE register, in bytes. For an + 8-bit controller this is typically 1, meaning that the registers + appear at consecutive bytes. If the value 2 two, that might indicate + a 16-bit register space. + +config SYS_ATA_DATA_OFFSET + hex "Offset of the data register" + default 0x0 + help + This is the offset of the controller's data register from the base + address of the controller. This is typically 0, but may be something + else if there are some other registers at the start of the + controller space. + +config SYS_ATA_REG_OFFSET + hex "Offset of the register space" + default 0x0 + help + This is the offset of the controller's 'register' space from the base + address of the controller. The data register (which is typically at + offset 0) has its own CONFIG, to deal with controllers where it is + somewhere else. Register 1 will be at this offset + 1, register 2 at + CONFIG_SYS_ATA_REG_OFFSET + 2, etc. + +config SYS_ATA_ALT_OFFSET + hex "Offset of the alternative registers" + default 0x0 + help + This is the offset of the controller's 'alternative' space from the + base address of the controller. This allows these registers to be + located separately from the data and register space. + +config SYS_ATA_IDE0_OFFSET + hex "Offset of bus 0" + default 0x1f0 + help + This is the start offset of bus 0 from the start of the + controller registers. All the other registers are calculated from + this address. using the above options. For x86 hardware this is often + 0x1f0. + +config SYS_ATA_IDE1_OFFSET + hex "Offset of bus 1" + default 0x170 + help + This is the start offset of bus 1 from the start of the + controller registers. All the other registers are calculated from + this address. using the above options. For x86 hardware this is often + 0x170. + +config ATAPI + bool "Enable ATAPI support" + help + This enabled Advanced Technology Attachment Packet Interface (ATAPI), + a protocol that allows a greater variety of devices to be connected + to the IDE port than with plain ATA. It allows SCSI commands to be + sent across the bus, e.g. to support optical drives. + +config IDE_RESET + bool "Support board-specific reset" + help + If this is defined, IDE Reset will be performed by calling the + function: + + ide_set_reset(int reset) + + where reset is 1 to assert reset and 0 to de-assert it. This function + must be defined in a board-specific file. + +endif # IDEinclude/ata.h +0
-3@@ -19,9 +19,6 @@* 8-bit (register) and 16-bit (data) accesses might use different * address spaces. This is implemented by the following definitions. */ -#ifndef CONFIG_SYS_ATA_STRIDE -#define CONFIG_SYS_ATA_STRIDE 1 -#endif #define ATA_IO_DATA (x) (CONFIG_SYS_ATA_DATA_OFFSET+((x) * CONFIG_SYS_ATA_STRIDE))#define ATA_IO_REG (x) (CONFIG_SYS_ATA_REG_OFFSET +((x) * CONFIG_SYS_ATA_STRIDE))include/configs/M5253DEMO.h +0
-13@@ -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 include/configs/coreboot.h +0
-9@@ -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 */ include/configs/edminiv2.h +0
-8@@ -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 */ include/configs/efi-x86_payload.h +0
-9@@ -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 */ include/configs/ib62x0.h +0
-2@@ -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 */ include/configs/lacie_kw.h +0
-2@@ -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 include/configs/malta.h +0
-6@@ -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 include/configs/openrd.h +0
-4@@ -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 */ include/configs/qemu-x86.h +0
-9@@ -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 include/configs/r2dplus.h +0
-8@@ -32,15 +32,7 @@/* * 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 include/configs/sandbox.h +0
-11@@ -29,17 +29,6 @@#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 8scripts/config_whitelist.txt +0
-9@@ -21,7 +21,6 @@ CONFIG_AT91SAM9M10G45EK CONFIG_AT91_GPIO_PULLUP CONFIG_AT91_LED CONFIG_AT91_WANTS_COMMON_PHY -CONFIG_ATAPI CONFIG_ATMEL_LCD CONFIG_ATMEL_LCD_BGR555 CONFIG_ATMEL_LCD_RGB565@@ -441,7 +440,6 @@ CONFIG_I2C_RTC_ADDR CONFIG_ICACHE CONFIG_ICS307_REFCLK_HZ CONFIG_IDE_PREINIT -CONFIG_IDE_RESET CONFIG_IMX CONFIG_IMX6_PWM_PER_CLK CONFIG_IMX_HDMI@@ -846,13 +844,6 @@ CONFIG_SYS_AT91_MAIN_CLOCK CONFIG_SYS_AT91_PLLA CONFIG_SYS_AT91_PLLB CONFIG_SYS_AT91_SLOW_CLOCK -CONFIG_SYS_ATA_ALT_OFFSET -CONFIG_SYS_ATA_BASE_ADDR -CONFIG_SYS_ATA_DATA_OFFSET -CONFIG_SYS_ATA_IDE0_OFFSET -CONFIG_SYS_ATA_IDE1_OFFSET -CONFIG_SYS_ATA_REG_OFFSET -CONFIG_SYS_ATA_STRIDE CONFIG_SYS_AUTOLOAD CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION CONFIG_SYS_AUXCORE_BOOTDATA
scripts/config_whitelist.txt CONFIG_SYS_I2C_RTC_ADDR · line 1414
Quoted 8 lines
scripts/config_whitelist.txt +0
-2@@ -1418,8 +1409,6 @@ CONFIG_SYS_I2C_RTC_ADDR CONFIG_SYS_I2C_TCA642X_ADDR CONFIG_SYS_I2C_TCA642X_BUS_NUM CONFIG_SYS_ICACHE_INV -CONFIG_SYS_IDE_MAXBUS -CONFIG_SYS_IDE_MAXDEVICE CONFIG_SYS_IFC_ADDR CONFIG_SYS_IFC_CCR CONFIG_SYS_INIT_DBCR
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 2/3] Convert CONFIG_SYS_IDE_MAXBUS et al to Kconfig
In reply to Simon GlassQuoted 13 lines · Simon Glass
This converts the following to
Kconfig:
CONFIG_SYS_IDE_MAXBUS
CONFIG_SYS_IDE_MAXDEVICE
CONFIG_SYS_ATA_BASE_ADDR
CONFIG_SYS_ATA_STRIDE
CONFIG_SYS_ATA_DATA_OFFSET
CONFIG_SYS_ATA_REG_OFFSET
CONFIG_SYS_ATA_ALT_OFFSET
CONFIG_SYS_ATA_IDE0_OFFSET
CONFIG_SYS_ATA_IDE1_OFFSET
CONFIG_ATAPI
CONFIG_IDE_RESET
Quoted 2 lines
Signed-off-by Simon Glass <[email protected]>Reviewed-by Stefan Roese <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 3/3 Drop CONFIG_SYS_PIO_MODE
In reply to Simon GlassThis option is not used in U-Boot. Drop it.
---
include/configs/r2dplus.h | 5 ----- scripts/config_whitelist.txt | 1 - 2 files changed, 6 deletions(-)
include/configs/r2dplus.h +0 -5
@@ -29,11 +29,6 @@*/ #define CONFIG_SYS_PLL_SETTLING_TIME 100/* in us */ -/* -* IDE support -*/ -#define CONFIG_SYS_PIO_MODE 1 -/* * SuperH PCI Bridge Configration */
scripts/config_whitelist.txt +0 -1
@@ -1791,7 +1791,6 @@ CONFIG_SYS_PIOC_PDR_VAL1 CONFIG_SYS_PIOC_PPUDR_VAL CONFIG_SYS_PIOD_PDR_VAL1 CONFIG_SYS_PIOD_PPUDR_VAL -CONFIG_SYS_PIO_MODE CONFIG_SYS_PJPAR CONFIG_SYS_PL310_BASE CONFIG_SYS_PLLAR_VAL
Signature · 1 line
2.35.0.rc0.227.g00780c9af4-goog
Re: [PATCH 3/3] Drop CONFIG_SYS_PIO_MODE
Quoted 3 lines · Simon Glass
This option is not used in U-Boot. Drop it.
Signed-off-by Simon Glass <[email protected]>
Thanks,
Stefan
Quoted 28 lines
---
include/configs/r2dplus.h | 5 ----- scripts/config_whitelist.txt | 1 - 2 files changed, 6 deletions(-)include/configs/r2dplus.h +0
-5@@ -29,11 +29,6 @@*/ #define CONFIG_SYS_PLL_SETTLING_TIME 100/* in us */ -/* -* IDE support -*/ -#define CONFIG_SYS_PIO_MODE 1 -/* * SuperH PCI Bridge Configration */ scripts/config_whitelist.txt +0
-0
scripts/config_whitelist.txt CONFIG_SYS_PIOC_PDR_VAL1 · line 1796
Quoted 7 lines
scripts/config_whitelist.txt +0
-1@@ -1791,7 +1791,6 @@ CONFIG_SYS_PIOC_PDR_VAL1 CONFIG_SYS_PIOC_PPUDR_VAL CONFIG_SYS_PIOD_PDR_VAL1 CONFIG_SYS_PIOD_PPUDR_VAL -CONFIG_SYS_PIO_MODE CONFIG_SYS_PJPAR CONFIG_SYS_PL310_BASE CONFIG_SYS_PLLAR_VAL
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 3/3] Drop CONFIG_SYS_PIO_MODE
In reply to Simon GlassQuoted 4 lines · Simon Glass
This option is not used in U-Boot. Drop it.
Signed-off-by Simon Glass <[email protected]>Reviewed-by Stefan Roese <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom