Migrate the base and sub-options to Kconfig. Note that we only enable this in the base sandbox config now.

Cc: Alexey Brodkin alexey.brodkin@gmail.com Cc: Michal Simek michal.simek@xilinx.com Signed-off-by: Tom Rini trini@konsulko.com --- Is this driver still used anywhere? It's fishy that it's only enabled in sandbox anymore. --- README | 12 ------------ configs/sandbox_defconfig | 3 +++ drivers/block/Kconfig | 18 ++++++++++++++++++ include/configs/sandbox.h | 4 ---- 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/README b/README index 2f9034ed5e22..57d985d0f1d4 100644 --- a/README +++ b/README @@ -2274,18 +2274,6 @@ The following options need to be configured: CONFIG_SF_DEFAULT_MODE (see include/spi.h) CONFIG_SF_DEFAULT_SPEED in Hz

- CONFIG_SYSTEMACE - - Adding this option adds support for Xilinx SystemACE - chips attached via some sort of local bus. The address - of the chip must also be defined in the - CONFIG_SYS_SYSTEMACE_BASE macro. For example: - - #define CONFIG_SYSTEMACE - #define CONFIG_SYS_SYSTEMACE_BASE 0xf0000000 - - When SystemACE support is added, the "ace" device type - becomes available to the fat commands, i.e. fatls.

- TFTP Fixed UDP Port: CONFIG_TFTP_PORT diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 41a2e34235dd..3acf9089cdb4 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -80,6 +80,9 @@ CONFIG_DEVRES=y CONFIG_DEBUG_DEVRES=y CONFIG_ADC=y CONFIG_ADC_SANDBOX=y +CONFIG_SYSTEMACE=y +CONFIG_SYS_SYSTEMACE_BASE=0x0 +CONFIG_SYS_SYSTEMACE_WIDTH=16 CONFIG_CLK=y CONFIG_CPU=y CONFIG_DM_DEMO=y diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 26760895f99d..e2c80f2075e2 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -38,3 +38,21 @@ 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. + +config SYSTEMACE + bool "Xilinx SystemACE support" + help + Adding this option adds support for Xilinx SystemACE chips attached + via some sort of local bus. The address of the chip must also be + defined in the CONFIG_SYS_SYSTEMACE_BASE macro. + + When SystemACE support is added, the "ace" device type becomes + available to the fat commands, i.e. fatls. + +config SYS_SYSTEMACE_BASE + hex "Base address of SystemACE chip" + depends on SYSTEMACE + +config SYS_SYSTEMACE_WIDTH + int "Word size of access to the of SystemACE chip" + depends on SYSTEMACE diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index de1c8a2a3855..b0a749caecc2 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -142,10 +142,6 @@

#define CONFIG_SYS_SATA_MAX_DEVICE 2

-#define CONFIG_SYSTEMACE -#define CONFIG_SYS_SYSTEMACE_WIDTH 16 -#define CONFIG_SYS_SYSTEMACE_BASE 0 - #define CONFIG_MISC_INIT_F

#endif