mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-02 09:30:43 +09:00
ppc4xx: use CONFIG_PCI_BOOTDELAY instead of private implementation
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> Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
parent
a63d965275
commit
2fe6b7f70f
@ -617,21 +617,6 @@ void pci_master_init(struct pci_controller *hose)
|
|||||||
|
|
||||||
static void wait_for_pci_ready(void)
|
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)) {
|
if (!(in_be32((void*)GPIO1_IR) & GPIO1_PPC_EREADY)) {
|
||||||
printf("PCI: Waiting for EREADY (CTRL-C to skip) ... ");
|
printf("PCI: Waiting for EREADY (CTRL-C to skip) ... ");
|
||||||
while (1) {
|
while (1) {
|
||||||
|
@ -432,6 +432,8 @@
|
|||||||
#define CONFIG_SYS_PCI_MASTER_INIT
|
#define CONFIG_SYS_PCI_MASTER_INIT
|
||||||
#define CONFIG_SYS_PCI_BOARD_FIXUP_IRQ
|
#define CONFIG_SYS_PCI_BOARD_FIXUP_IRQ
|
||||||
|
|
||||||
|
#define CONFIG_PCI_BOOTDELAY 0
|
||||||
|
|
||||||
/* PCI identification */
|
/* PCI identification */
|
||||||
#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x12FE /* PCI Vendor ID: esd gmbh */
|
#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 */
|
#define CONFIG_SYS_PCI_SUBSYS_ID_NONMONARCH 0x0441 /* PCI Device ID: Non-Monarch */
|
||||||
|
Loading…
Reference in New Issue
Block a user