diff options
| author | Simon Glass <sjg@chromium.org> | 2017-05-17 03:25:30 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-22 12:45:27 -0400 |
| commit | fc843a02acad62e231a3e779cebd1712688146fc (patch) | |
| tree | b2811ec28b2378f0b471d3173e59768834d41929 /common/board_r.c | |
| parent | 75eb9976b78ace0e667c1f5faf367acfaed141df (diff) | |
| download | u-boot-fc843a02acad62e231a3e779cebd1712688146fc.tar.gz | |
Kconfig: Add a CONFIG_IDE option
At present IDE support is controlled by CONFIG_CMD_IDE. Add a separate
CONFIG_IDE option so that IDE support can be enabled without requiring
the 'ide' command.
Update existing users and move the ide driver into drivers/block since
it should not be in common/.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/common/board_r.c b/common/board_r.c index 28f32c3885..fe7a70b589 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -23,9 +23,7 @@ #include <dm.h> #include <environment.h> #include <fdtdec.h> -#if defined(CONFIG_CMD_IDE) #include <ide.h> -#endif #include <initcall.h> #include <init_helpers.h> #ifdef CONFIG_PS2KBD @@ -611,7 +609,7 @@ static int initr_post(void) } #endif -#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_CMD_IDE) +#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_IDE) static int initr_pcmcia(void) { puts("PCMCIA:"); @@ -620,7 +618,7 @@ static int initr_pcmcia(void) } #endif -#if defined(CONFIG_CMD_IDE) +#if defined(CONFIG_IDE) static int initr_ide(void) { #ifdef CONFIG_IDE_8xx_PCCARD @@ -870,10 +868,10 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_POST initr_post, #endif -#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_CMD_IDE) +#if defined(CONFIG_CMD_PCMCIA) && !defined(CONFIG_IDE) initr_pcmcia, #endif -#if defined(CONFIG_CMD_IDE) +#if defined(CONFIG_IDE) initr_ide, #endif #ifdef CONFIG_LAST_STAGE_INIT |