Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8e5b284 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

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



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: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a6b33006

arch/arm/configs/enp2611_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ CONFIG_ALIGNMENT_TRAP=y 
#

CONFIG_ZBOOT_ROM_TEXT=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



#

arch/arm/configs/ixdp2400_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ CONFIG_ALIGNMENT_TRAP=y 
#

CONFIG_ZBOOT_ROM_TEXT=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



#

arch/arm/configs/ixdp2401_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ CONFIG_ALIGNMENT_TRAP=y 
#

CONFIG_ZBOOT_ROM_TEXT=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



#

arch/arm/configs/ixdp2801_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ CONFIG_ALIGNMENT_TRAP=y 
#

CONFIG_ZBOOT_ROM_TEXT=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



#

arch/arm/mach-ixp2000/enp2611.c

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ static void __init enp2611_pci_preinit(void) 
{

	ixp2000_reg_write(IXP2000_PCI_ADDR_EXT, 0x00100000);

	ixp2000_pci_preinit();

	pcibios_setup("firmware");

}



static inline int enp2611_pci_valid_device(struct pci_bus *bus,