Skip to content

Commit 3d42722

Browse files
committed
ARM: ixp4xx: enable multiplatform support
After all the work that Linus Walleij did on this platform, it can be part of a generic kernel build as well. Note that there are known bugs in little-endian mode on ixp4xx, and no other ARMv5 platform at this point supports big-endian mode, or is likely to in the future, so there is limited practical value in this, but it helps with build testing and ixp4xx little-endian support may get fixed in the future. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Tested-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 5d6f526 commit 3d42722

5 files changed

Lines changed: 16 additions & 81 deletions

File tree

arch/arm/Kconfig

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -357,22 +357,6 @@ config ARCH_FOOTBRIDGE
357357
Support for systems based on the DC21285 companion chip
358358
("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
359359

360-
config ARCH_IXP4XX
361-
bool "IXP4xx-based"
362-
depends on CPU_BIG_ENDIAN
363-
select ARM_PATCH_PHYS_VIRT
364-
select CPU_XSCALE
365-
select GPIO_IXP4XX
366-
select GPIOLIB
367-
select HAVE_PCI
368-
select IXP4XX_IRQ
369-
select IXP4XX_TIMER
370-
select SPARSE_IRQ
371-
select USB_EHCI_BIG_ENDIAN_DESC
372-
select USB_EHCI_BIG_ENDIAN_MMIO
373-
help
374-
Support for Intel's IXP4XX (XScale) family of processors.
375-
376360
config ARCH_PXA
377361
bool "PXA2xx/PXA3xx-based"
378362
depends on CPU_LITTLE_ENDIAN

arch/arm/configs/ixp4xx_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ CONFIG_EXPERT=y
66
CONFIG_MODULES=y
77
CONFIG_MODVERSIONS=y
88
# CONFIG_BLK_DEV_BSG is not set
9+
# CONFIG_ARCH_MULTI_V7 is not set
910
CONFIG_ARCH_IXP4XX=y
1011
CONFIG_MACH_NSLU2=y
1112
CONFIG_MACH_AVILA=y

arch/arm/mach-ixp4xx/Kconfig

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
# SPDX-License-Identifier: GPL-2.0-only
2-
if ARCH_IXP4XX
3-
4-
menu "Intel IXP4xx Implementation Options"
2+
menuconfig ARCH_IXP4XX
3+
bool "IXP4xx-based platforms"
4+
depends on ARCH_MULTI_V5
5+
depends on CPU_BIG_ENDIAN
6+
select CPU_XSCALE
7+
select GPIO_IXP4XX
8+
select GPIOLIB
9+
select FORCE_PCI
10+
select IXP4XX_IRQ
11+
select IXP4XX_TIMER
12+
select USB_EHCI_BIG_ENDIAN_DESC
13+
select USB_EHCI_BIG_ENDIAN_MMIO
14+
help
15+
Support for Intel's IXP4XX (XScale) family of processors.
516

6-
comment "IXP4xx Platforms"
17+
if ARCH_IXP4XX
718

819
config MACH_IXP4XX_OF
920
bool
@@ -12,11 +23,8 @@ config MACH_IXP4XX_OF
1223
select ARM_APPENDED_DTB # Old Redboot bootloaders deployed
1324
select I2C
1425
select I2C_IOP3XX
15-
select PCI
1626
select USE_OF
1727
help
1828
Say 'Y' here to support Device Tree-based IXP4xx platforms.
1929

20-
endmenu
21-
2230
endif

arch/arm/mach-ixp4xx/Makefile.boot

Lines changed: 0 additions & 4 deletions
This file was deleted.

arch/arm/mach-ixp4xx/include/mach/uncompress.h

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)