Commit b83e139c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'cns3xxx/multiplatform' into next/multiplatform 



I've looked at all the platforms recently to see what their
state is. cns3xxx seems quite clean but not very actively
maintained. Since it is really easy to convert to multiplatform,
that's what I did here.

* cns3xxx/multiplatform:
  ARM: cns3xxx: initial DT support
  ARM: cns3xxx: enable multiplatform support
  ARM: cns3xxx: move debug_ll code to include/debug/
  ARM: cns3xxx: enable sparse IRQ support
  ARM: cns3xxx: make mach header files local

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0203e0f7 415f5914

arch/arm/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -382,17 +382,6 @@ config ARCH_BCM2835 
	  This enables support for the Broadcom BCM2835 SoC. This SoC is

	  use in the Raspberry Pi, and Roku 2 devices.



config ARCH_CNS3XXX

	bool "Cavium Networks CNS3XXX family"

	select ARM_GIC

	select CPU_V6K

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_CACHE_L2X0

	select MIGHT_HAVE_PCI

	select PCI_DOMAINS if PCI

	help

	  Support for Cavium Networks CNS3XXX platform.



config ARCH_CLPS711X

	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"

	select ARCH_REQUIRE_GPIOLIB

arch/arm/Kconfig.debug

+8 −0
Original line number Diff line number Diff line
@@ -103,6 +103,13 @@ choice 
		  Say Y here if you want the debug print routines to direct

		  their output to the second serial port on these devices.



	config DEBUG_CNS3XXX

		bool "Kernel Kernel low-level debugging on Cavium Networks CNS3xxx"

		depends on ARCH_CNS3XXX

		help

		  Say Y here if you want the debug print routines to direct

                  their output to the CNS3xxx UART0.



	config DEBUG_DAVINCI_DA8XX_UART1

		bool "Kernel low-level debugging on DaVinci DA8XX using UART1"

		depends on ARCH_DAVINCI_DA8XX
@@ -586,6 +593,7 @@ endchoice 


config DEBUG_LL_INCLUDE

	string

	default "debug/cns3xxx.S" if DEBUG_CNS3XXX

	default "debug/icedcc.S" if DEBUG_ICEDCC

	default "debug/imx.S" if DEBUG_IMX1_UART || \

				 DEBUG_IMX25_UART || \

arch/arm/configs/cns3420vb_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -19,8 +19,11 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODVERSIONS=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_IOSCHED_CFQ=m

CONFIG_ARCH_MULTI_V6=y

#CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_CNS3XXX=y

CONFIG_MACH_CNS3420VB=y

CONFIG_DEBUG_CNS3XXX=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

arch/arm/mach-cns3xxx/Kconfig

+12 −0
Original line number Diff line number Diff line 
config ARCH_CNS3XXX

	bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6

	select ARM_GIC

	select CPU_V6K

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_CACHE_L2X0

	select MIGHT_HAVE_PCI

	select PCI_DOMAINS if PCI

	help

	  Support for Cavium Networks CNS3XXX platform.



menu "CNS3XXX platform type"

	depends on ARCH_CNS3XXX



config MACH_CNS3420VB

	bool "Support for CNS3420 Validation Board"

	depends on ATAGS

	help

	  Include support for the Cavium Networks CNS3420 MPCore Platform

	  Baseboard.

CRA Git | Maintained and supported by SUSTech CRA and CCSE