diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-02 00:03:08 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-02 00:03:08 +0100 |
| commit | 797449a16d7f56ce1a7e38e3d85061f933b92c17 (patch) | |
| tree | fcc0015191642a15c5dbea1ab2a34ebb80883b7a /board/esd/pmc440/pmc440.c | |
| parent | d51e6d6de2b7dcba43fadcae2c89f7346d8bc301 (diff) | |
| parent | 255ef4d9091fe896ff152629a8cb290ee92c9fde (diff) | |
| download | u-boot-imx-797449a16d7f56ce1a7e38e3d85061f933b92c17.zip u-boot-imx-797449a16d7f56ce1a7e38e3d85061f933b92c17.tar.gz u-boot-imx-797449a16d7f56ce1a7e38e3d85061f933b92c17.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
* 'master' of git://git.denx.de/u-boot-ppc4xx:
ppc4xx: Add Io64 board support
ppc4xx: fix PMC440 painit command
ppc4xx: remove invalid access to PCI_BRDGOPT2 register
ppc4xx: use CONFIG_PCI_BOOTDELAY instead of private implementation
Diffstat (limited to 'board/esd/pmc440/pmc440.c')
| -rw-r--r-- | board/esd/pmc440/pmc440.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/board/esd/pmc440/pmc440.c b/board/esd/pmc440/pmc440.c index 5236f44..3713e37 100644 --- a/board/esd/pmc440/pmc440.c +++ b/board/esd/pmc440/pmc440.c @@ -574,8 +574,6 @@ void pci_target_init(struct pci_controller *hose) /* No error reporting */ pci_hose_write_config_word(hose, 0, PCI_ERREN, 0); - pci_write_config_dword(0, PCI_BRDGOPT2, 0x00000101); - if (!is_monarch()) { /* Program the board's subsystem id/classcode */ pci_hose_write_config_word(hose, 0, PCI_SUBSYSTEM_ID, @@ -617,21 +615,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) { |