diff options
| author | Simon Glass <sjg@chromium.org> | 2023-04-25 10:54:29 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-04-27 13:51:06 -0400 |
| commit | 00a79f21c1c178d312635b96035da6aa48eb5321 (patch) | |
| tree | fbfb36f244923bb4c3dd3c5f5d2210645cf25a5e | |
| parent | 091785110031efe1f417a727ac7db68f2beb3116 (diff) | |
| download | u-boot-00a79f21c1c178d312635b96035da6aa48eb5321.tar.gz | |
ide: Drop init for not using BLK
ALl boards use CONFIG_BLK now so this code is not used. Drop it and the
header-file #ifdef
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/board_r.c | 12 | ||||
| -rw-r--r-- | include/ide.h | 7 |
2 files changed, 0 insertions, 19 deletions
diff --git a/common/board_r.c b/common/board_r.c index 7076af64f5d..d798c00a80a 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -519,15 +519,6 @@ static int initr_post(void) } #endif -#if defined(CONFIG_IDE) && !defined(CONFIG_BLK) -static int initr_ide(void) -{ - puts("IDE: "); - ide_init(); - return 0; -} -#endif - #if defined(CFG_PRAM) /* * Export available size of memory for Linux, taking into account the @@ -778,9 +769,6 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_POST initr_post, #endif -#if defined(CONFIG_IDE) && !defined(CONFIG_BLK) - initr_ide, -#endif #ifdef CONFIG_LAST_STAGE_INIT INIT_FUNC_WATCHDOG_RESET /* diff --git a/include/ide.h b/include/ide.h index 9c0d40364a8..457f275c61b 100644 --- a/include/ide.h +++ b/include/ide.h @@ -18,17 +18,10 @@ void ide_init(void); struct blk_desc; struct udevice; -#ifdef CONFIG_BLK ulong ide_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, void *buffer); ulong ide_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, const void *buffer); -#else -ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt, - void *buffer); -ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt, - const void *buffer); -#endif #if defined(CONFIG_OF_IDE_FIXUP) int ide_device_present(int dev); |