Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ARM] 3302/1: make pci=firmware the default for ixp2000

Browse source 
Patch from Lennert Buytenhek

Most ixp2000 boards don't actually work if pci=firmware isn't used, so
the defconfig isn't really the right place to specify this.  Instead of
specifying it in the defconfigs, make the relevant board code take care
of setting pci=firmware.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Lennert Buytenhek 2006-02-08 21:09:04 +00:00 committed by Russell King
parent a6b3300609
commit f8e5b28413
7 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/configs/enp2611_defconfig
View file

@ -171,7 +171,7 @@ CONFIG_ALIGNMENT_TRAP=y
# #
CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="console=ttyS0,57600 root=/dev/nfs ip=bootp mem=64M@0x0 pci=firmware" CONFIG_CMDLINE="console=ttyS0,57600 root=/dev/nfs ip=bootp mem=64M@0x0"
# CONFIG_XIP_KERNEL is not set # CONFIG_XIP_KERNEL is not set
# #

2
arch/arm/configs/ixdp2400_defconfig
View file

@ -172,7 +172,7 @@ CONFIG_ALIGNMENT_TRAP=y
# #
CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="console=ttyS0,57600 root=/dev/nfs ip=bootp mem=64M@0x0 pci=firmware" CONFIG_CMDLINE="console=ttyS0,57600 root=/dev/nfs ip=bootp mem=64M@0x0"
# CONFIG_XIP_KERNEL is not set # CONFIG_XIP_KERNEL is not set
# #

2
arch/arm/configs/ixdp2401_defconfig
View file

@ -172,7 +172,7 @@ CONFIG_ALIGNMENT_TRAP=y
# #
CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp mem=64M@0x0 pci=firmware" CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp mem=64M@0x0"
# CONFIG_XIP_KERNEL is not set # CONFIG_XIP_KERNEL is not set
# #

2
arch/arm/configs/ixdp2801_defconfig
View file

@ -172,7 +172,7 @@ CONFIG_ALIGNMENT_TRAP=y
# #
CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp mem=64M@0x0 pci=firmware" CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp mem=64M@0x0"
# CONFIG_XIP_KERNEL is not set # CONFIG_XIP_KERNEL is not set
# #

1
arch/arm/mach-ixp2000/enp2611.c
View file

@ -106,6 +106,7 @@ static void __init enp2611_pci_preinit(void)
{ {
ixp2000_reg_write(IXP2000_PCI_ADDR_EXT, 0x00100000); ixp2000_reg_write(IXP2000_PCI_ADDR_EXT, 0x00100000);
ixp2000_pci_preinit(); ixp2000_pci_preinit();
pcibios_setup("firmware");
} }
static inline int enp2611_pci_valid_device(struct pci_bus *bus, static inline int enp2611_pci_valid_device(struct pci_bus *bus,

1
arch/arm/mach-ixp2000/ixdp2400.c
View file

@ -68,6 +68,7 @@ void __init ixdp2400_pci_preinit(void)
{ {
ixp2000_reg_write(IXP2000_PCI_ADDR_EXT, 0x00100000); ixp2000_reg_write(IXP2000_PCI_ADDR_EXT, 0x00100000);
ixp2000_pci_preinit(); ixp2000_pci_preinit();
pcibios_setup("firmware");
} }
int ixdp2400_pci_setup(int nr, struct pci_sys_data *sys) int ixdp2400_pci_setup(int nr, struct pci_sys_data *sys)

1
arch/arm/mach-ixp2000/ixdp2x01.c
View file

@ -212,6 +212,7 @@ void __init ixdp2x01_pci_preinit(void)
{ {
ixp2000_reg_write(IXP2000_PCI_ADDR_EXT, 0x00000000); ixp2000_reg_write(IXP2000_PCI_ADDR_EXT, 0x00000000);
ixp2000_pci_preinit(); ixp2000_pci_preinit();
pcibios_setup("firmware");
} }
#define DEVPIN(dev, pin) ((pin) | ((dev) << 3)) #define DEVPIN(dev, pin) ((pin) | ((dev) << 3))