Patchwork [U-Boot,1/3] ppc4xx: use CONFIG_PCI_BOOTDELAY instead of private implementation

login
register
mail settings
Submitter Matthias Fuchs
Date Oct. 13, 2011, 1:12 p.m.
Message ID <13185115443925-git-send-email-matthias.fuchs@esd.eu>
Download mbox | patch
Permalink /patch/119501/
State Accepted
Commit 2fe6b7f70f423b66e23ad6fb0848b71252b2b2cd
Delegated to: Stefan Roese
Headers show

Comments

Matthias Fuchs - Oct. 13, 2011, 1:12 p.m.
From: Matthias Fuchs <matthias.fuchs@esd.eu>

This patch switches PMC440 board code to the CONFIG_PCI_BOOTDELAY option
instead of using a private implemention. This relies on Anatolji's patch
that moves the pcidelay handling behind pci_target_init.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
---
 board/esd/pmc440/pmc440.c |   15 ---------------
 include/configs/PMC440.h  |    2 ++
 2 files changed, 2 insertions(+), 15 deletions(-)
Stefan Roese - Dec. 1, 2011, 8:12 a.m.
On Thursday 13 October 2011 15:12:22 matthias.fuchs@esd.eu wrote:
> From: Matthias Fuchs <matthias.fuchs@esd.eu>
> 
> This patch switches PMC440 board code to the CONFIG_PCI_BOOTDELAY option
> instead of using a private implemention. This relies on Anatolji's patch
> that moves the pcidelay handling behind pci_target_init.

Applied to u-boot-ppc4xx. Thanks.
 
Best regards,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de

Patch

diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c
index 5236f44..0d56064 100644
--- a/board/esd/pmc440/pmc440.c
+++ b/board/esd/pmc440/pmc440.c
@@ -617,21 +617,6 @@  void pci_master_init(struct pci_controller *hose)
 
 static void wait_for_pci_ready(void)
 {
-	int i;
-	char *s = getenv("pcidelay");
-	/*
-	 * We have our own handling of the pcidelay variable.
-	 * Using CONFIG_PCI_BOOTDELAY enables pausing for host
-	 * and adapter devices. For adapter devices we do not
-	 * want this.
-	 */
-	if (s) {
-		int ms = simple_strtoul(s, NULL, 10);
-		printf("PCI:   Waiting for %d ms\n", ms);
-		for (i=0; i<ms; i++)
-			udelay(1000);
-	}
-
 	if (!(in_be32((void*)GPIO1_IR) & GPIO1_PPC_EREADY)) {
 		printf("PCI:   Waiting for EREADY (CTRL-C to skip) ... ");
 		while (1) {
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index bee74aa..ed47a87 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -432,6 +432,8 @@ 
 #define CONFIG_SYS_PCI_MASTER_INIT
 #define CONFIG_SYS_PCI_BOARD_FIXUP_IRQ
 
+#define CONFIG_PCI_BOOTDELAY 0
+
 /* PCI identification */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x12FE	/* PCI Vendor ID: esd gmbh      */
 #define CONFIG_SYS_PCI_SUBSYS_ID_NONMONARCH 0x0441	/* PCI Device ID: Non-Monarch */