Skip to contentSkip to conversation

block: ide: Drop CONFIG_IDE_INIT_POSTRESET

PATCH New Bin Meng 2 participants 6 messages Sep 2, 2017 – Sep 4, 2017 Block layer

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 1/3 block: ide: Drop CONFIG_IDE_INIT_POSTRESET

This is not referenced anywhere. Drop it.

Signed-off-by Bin Meng <[email protected]>

---

 drivers/block/ide.c          | 9 ---------
 include/ide.h                | 4 ----
 scripts/config_whitelist.txt | 1 -
 3 files changed, 14 deletions(-)
drivers/block/ide.c +0 -9
index edcf87b..cea0397 100644
@@ -792,15 +792,6 @@ void ide_init(void)
 	/* ATAPI Drives seems to need a proper IDE Reset */
 	ide_reset();
 
-#ifdef CONFIG_IDE_INIT_POSTRESET
-	WATCHDOG_RESET();
-
-	if (ide_init_postreset()) {
-		puts("ide_preinit_postreset failed\n");
-		return;
-	}
-#endif /* CONFIG_IDE_INIT_POSTRESET */
-
 	/*
 	 * Wait for IDE to get ready.
 	 * According to spec, this can take up to 31 seconds!
include/ide.h +0 -4
index 9b0a4a9..a4be763 100644
@@ -51,10 +51,6 @@ ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
 int ide_preinit(void);
 #endif
 
-#ifdef CONFIG_IDE_INIT_POSTRESET
-int ide_init_postreset(void);
-#endif
-
 #if defined(CONFIG_OF_IDE_FIXUP)
 int ide_device_present(int dev);
 #endif
scripts/config_whitelist.txt +0 -1
index 84dc5c9..440f740 100644
@@ -1080,7 +1080,6 @@ CONFIG_I2C_RTC_ADDR
 CONFIG_I2C_TIMEOUT
 CONFIG_ICACHE
 CONFIG_ICS307_REFCLK_HZ
-CONFIG_IDE_INIT_POSTRESET
 CONFIG_IDE_LED
 CONFIG_IDE_PCMCIA
 CONFIG_IDE_PREINIT
Signature · 1 line
2.9.2
author
#1 lore raw

PATCH 2/3 block: ide: Drop CONFIG_IDE_LED

This is actually not used. Drop it.

Signed-off-by Bin Meng <[email protected]>

---

 drivers/block/ide.c          | 46 --------------------------------------------
 include/configs/dbau1x00.h   |  1 -
 include/configs/lsxl.h       |  1 -
 include/configs/pb1x00.h     |  1 -
 include/ide.h                | 13 -------------
 scripts/config_whitelist.txt |  1 -
 6 files changed, 63 deletions(-)
drivers/block/ide.c +0 -46
index cea0397..ce51153 100644
@@ -44,12 +44,6 @@ struct blk_desc ide_dev_desc[CONFIG_SYS_IDE_MAXDEVICE];
 #define CONFIG_SYS_ATA_PORT_ADDR(port) (port)
 #endif
 
-#ifndef CONFIG_IDE_LED	/* define LED macros, they are not used anyways */
-# define DEVICE_LED(x) 0
-# define LED_IDE1 1
-# define LED_IDE2 2
-#endif
-
 #ifdef CONFIG_IDE_RESET
 extern void ide_set_reset(int idereset);
 

@@ -217,8 +211,6 @@ unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen,
 	unsigned char c, err, mask, res;
 	int n;
 
-	ide_led(DEVICE_LED(device), 1);	/* LED on       */
-
 	/* Select device
 	 */
 	mask = ATA_STAT_BUSY | ATA_STAT_DRQ;

@@ -326,7 +318,6 @@ unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen,
 		err = 0;
 	}
 AI_OUT:
-	ide_led(DEVICE_LED(device), 0);	/* LED off      */
 	return err;
 }
 

@@ -560,7 +551,6 @@ static void ide_ident(struct blk_desc *dev_desc)
 	device = dev_desc->devnum;
 	printf("  Device %d: ", device);
 
-	ide_led(DEVICE_LED(device), 1);	/* LED on       */
 	/* Select device
 	 */
 	ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));

@@ -600,7 +590,6 @@ static void ide_ident(struct blk_desc *dev_desc)
 			 */
 			c = ide_wait(device, IDE_TIME_OUT);
 		}
-		ide_led(DEVICE_LED(device), 0);	/* LED off      */
 
 		if (((c & ATA_STAT_DRQ) == 0) ||
 		    ((c & (ATA_STAT_FAULT | ATA_STAT_ERR)) != 0)) {

@@ -716,22 +705,6 @@ static void ide_ident(struct blk_desc *dev_desc)
 #endif
 }
 
-__weak void ide_led(uchar led, uchar status)
-{
-#if defined(CONFIG_IDE_LED) && defined(PER8_BASE) /* required by LED_PORT */
-	static uchar led_buffer;	/* Buffer for current LED status */
-
-	uchar *led_port = LED_PORT;
-
-	if (status)		/* switch LED on        */
-		led_buffer |= led;
-	else			/* switch LED off       */
-		led_buffer &= ~led;
-
-	*led_port = led_buffer;
-#endif
-}
-
 __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",

@@ -783,12 +756,6 @@ void ide_init(void)
 
 	WATCHDOG_RESET();
 
-	/*
-	 * Reset the IDE just to be sure.
-	 * Light LED's to show
-	 */
-	ide_led((LED_IDE1 | LED_IDE2), 1);	/* LED's on     */
-
 	/* ATAPI Drives seems to need a proper IDE Reset */
 	ide_reset();
 

@@ -818,8 +785,6 @@ void ide_init(void)
 			i++;
 			if (i > (ATA_RESET_TIME * 100)) {
 				puts("** Timeout **\n");
-				/* LED's off */
-				ide_led((LED_IDE1 | LED_IDE2), 0);
 				return;
 			}
 			if ((i >= 100) && ((i % 100) == 0))

@@ -844,10 +809,7 @@ void ide_init(void)
 
 	putc('\n');
 
-	ide_led((LED_IDE1 | LED_IDE2), 0);	/* LED's off    */
-
 	for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; ++i) {
-		int led = (IDE_BUS(i) == 0) ? LED_IDE1 : LED_IDE2;
 		ide_dev_desc[i].type = DEV_TYPE_UNKNOWN;
 		ide_dev_desc[i].if_type = IF_TYPE_IDE;
 		ide_dev_desc[i].devnum = i;

@@ -862,9 +824,7 @@ void ide_init(void)
 #endif
 		if (!ide_bus_ok[IDE_BUS(i)])
 			continue;
-		ide_led(led, 1);	/* LED on       */
 		ide_ident(&ide_dev_desc[i]);
-		ide_led(led, 0);	/* LED off      */
 		dev_print(&ide_dev_desc[i]);
 
 		if ((ide_dev_desc[i].lba > 0) && (ide_dev_desc[i].blksz > 0)) {

@@ -987,8 +947,6 @@ ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
 	debug("ide_read dev %d start " LBAF ", blocks " LBAF " buffer at %lX\n",
 	      device, blknr, blkcnt, (ulong) buffer);
 
-	ide_led(DEVICE_LED(device), 1);	/* LED on       */
-
 	/* Select device
 	 */
 	ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));

@@ -1086,7 +1044,6 @@ ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
 		buffer += ATA_BLOCKSIZE;
 	}
 IDE_READ_E:
-	ide_led(DEVICE_LED(device), 0);	/* LED off      */
 	return n;
 }
 

@@ -1114,8 +1071,6 @@ ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
 	}
 #endif
 
-	ide_led(DEVICE_LED(device), 1);	/* LED on       */
-
 	/* Select device
 	 */
 	ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));

@@ -1179,7 +1134,6 @@ ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
 		buffer += ATA_BLOCKSIZE;
 	}
 WR_OUT:
-	ide_led(DEVICE_LED(device), 0);	/* LED off      */
 	return n;
 }
include/configs/dbau1x00.h +0 -1
index ce91f10..1207372 100644
@@ -163,7 +163,6 @@
 #define CONFIG_SYS_IDE_MAXBUS		1	/* max. 1 IDE bus		*/
 #define CONFIG_SYS_IDE_MAXDEVICE	1	/* max. 1 drive per IDE bus	*/
 
-#undef	CONFIG_IDE_LED			/* LED   for ide not supported	*/
 #undef	CONFIG_IDE_RESET		/* reset for ide not supported	*/
 
 #define CONFIG_SYS_ATA_IDE0_OFFSET	0x0000
include/configs/lsxl.h +0 -1
index 7cbbe87..5d5851f 100644
@@ -142,7 +142,6 @@
 #endif /* CONFIG_CMD_NET */
 
 #ifdef CONFIG_IDE
-#undef CONFIG_IDE_LED
 #undef CONFIG_SYS_IDE_MAXBUS
 #define CONFIG_SYS_IDE_MAXBUS		1
 #undef CONFIG_SYS_IDE_MAXDEVICE
include/configs/pb1x00.h +0 -1
index 369e82f..b7e3196 100644
@@ -115,7 +115,6 @@
 #define CONFIG_SYS_IDE_MAXBUS		1	/* max. 1 IDE bus		*/
 #define CONFIG_SYS_IDE_MAXDEVICE	1	/* max. 1 drive per IDE bus	*/
 
-#undef	CONFIG_IDE_LED			/* LED   for ide not supported	*/
 #undef	CONFIG_IDE_RESET		/* reset for ide not supported	*/
 
 #define CONFIG_SYS_ATA_IDE0_OFFSET	0x0000
include/ide.h +0 -13
index a4be763..4d78891 100644
@@ -15,19 +15,6 @@
 #define	ATA_CURR_BASE(dev)	(CONFIG_SYS_ATA_BASE_ADDR+ide_bus_offset[IDE_BUS(dev)])
 extern ulong ide_bus_offset[];
 
-#ifdef CONFIG_IDE_LED
-
-/*
- * LED Port
- */
-#define	LED_PORT	((uchar *)(PER8_BASE + 0x3000))
-#define LED_IDE1	0x01
-#define LED_IDE2	0x02
-#define	DEVICE_LED(d)	((d & 2) | ((d & 2) == 0)) /* depends on bit positions! */
-
-void ide_led(uchar led, uchar status);
-#endif /* CONFIG_IDE_LED */
-
 /*
  * Function Prototypes
  */
scripts/config_whitelist.txt +0 -1
index 440f740..2aa23dc 100644
@@ -1080,7 +1080,6 @@ CONFIG_I2C_RTC_ADDR
 CONFIG_I2C_TIMEOUT
 CONFIG_ICACHE
 CONFIG_ICS307_REFCLK_HZ
-CONFIG_IDE_LED
 CONFIG_IDE_PCMCIA
 CONFIG_IDE_PREINIT
 CONFIG_IDE_REG_CS
Signature · 1 line
2.9.2
#2 lore raw

PATCH 2/3 block: ide: Drop CONFIG_IDE_LED

Quoted 3 lines · Bin Meng

This is actually not used. Drop it.

Signed-off-by Bin Meng <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170903/c64578cf/attachment.sig>
author
#3 lore raw

PATCH 3/3 block: Drop the ftide020 driver

In reply to Bin Meng

This is not used in U-Boot.

Signed-off-by Bin Meng <[email protected]>

---

 drivers/block/Makefile       |   1 -
 drivers/block/ftide020.c     | 347 -------------------------------------------
 drivers/block/ftide020.h     | 266 ---------------------------------
 scripts/config_whitelist.txt |   3 -
 4 files changed, 617 deletions(-)
 delete mode 100644 drivers/block/ftide020.c
 delete mode 100644 drivers/block/ftide020.h
drivers/block/Makefile +0 -1
index dea2c15..d06a598 100644
@@ -12,7 +12,6 @@ obj-y += blk_legacy.o
 endif
 
 obj-$(CONFIG_IDE) += ide.o
-obj-$(CONFIG_IDE_FTIDE020) += ftide020.o
 obj-$(CONFIG_SANDBOX) += sandbox.o
 obj-$(CONFIG_SYSTEMACE) += systemace.o
 obj-$(CONFIG_BLOCK_CACHE) += blkcache.o
drivers/block/ftide020.c deleted +0 -347

347 lines not on this page · raw message

drivers/block/ftide020.h deleted +0 -266

266 lines not on this page · raw message

scripts/config_whitelist.txt +0 -3
index 2aa23dc..fb2224e 100644
@@ -377,8 +377,6 @@ CONFIG_CS8900_BUS32
 CONFIG_CSF_SIZE
 CONFIG_CTL_JTAG
 CONFIG_CTL_TBE
-CONFIG_CTRD1_PROBE_T1
-CONFIG_CTRD1_PROBE_T2
 CONFIG_CUSTOMER_BOARD_SUPPORT
 CONFIG_CYRUS
 CONFIG_D2NET_V2

@@ -1082,7 +1080,6 @@ CONFIG_ICACHE
 CONFIG_ICS307_REFCLK_HZ
 CONFIG_IDE_PCMCIA
 CONFIG_IDE_PREINIT
-CONFIG_IDE_REG_CS
 CONFIG_IDE_RESET
 CONFIG_IDE_SWAP_IO
 CONFIG_IDS8313
Signature · 1 line
2.9.2
#4 lore raw

PATCH 3/3 block: Drop the ftide020 driver

Quoted 3 lines · Bin Meng

This is not used in U-Boot.

Signed-off-by Bin Meng <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170903/c16708aa/attachment.sig>
#5 lore raw

PATCH 1/3 block: ide: Drop CONFIG_IDE_INIT_POSTRESET

In reply to Bin Meng
Quoted 3 lines · Bin Meng

This is not referenced anywhere. Drop it.

Signed-off-by Bin Meng <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170903/e448e02a/attachment.sig>