block: Migrate SystemACE chip to Kconfig

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.

diff --git a/README b/README
index b055ae7ef29c71ca65917f0f5858e58308fec419..81b7ee1ce8a759e85028ec750db2b6a777dfe3a3 100644 (file)
--- a/README
+++ b/README
@@ -2311,18 +2311,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 41a2e34235dd02d1ba52a15ebd106b9eef5383d1..3acf9089cdb4e619a594c8b5a84438e3ff80c7a5 100644 (file)
--- 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 26760895f99dd53370f9077f5b7213a1a6f241fe..e2c80f2075e2e15e5dd9dfeafc95043a911f223e 100644 (file)
--- 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 cfb3e7affd845c3232164ce20c516cfc8a86009e..2dc816410f85973d647734b092d54ab0fc987c8c 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -146,10 +146,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