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

Commit 0203e0f7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'nomadik-multiplatform' of... 

Merge tag 'nomadik-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/multiplatform

From Linus Walleij <linus.walleij@linaro.org>:

Multiplatform support for the Nomadik
- Get rid of the last header files in the <mach/*> namespace
- Move the debug macro to the common place
- Make the necessary Kconfig fixes and move the platform Kconfig
  fragment down to the mach directory.
- Include necessary defconfig update to get the platform going.

* tag 'nomadik-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik

:
  ARM: nomadik: delete remnant include files
  ARM: nomadik: convert to multiplatform
  ARM: nomadik: move debugmacro to debug includes
  ARM: nomadik: delete IRQ header

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f6161aa1 a2823dd5

arch/arm/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -916,23 +916,6 @@ config ARCH_U8500 
	help

	  Support for ST-Ericsson's Ux500 architecture



config ARCH_NOMADIK

	bool "STMicroelectronics Nomadik"

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select ARM_VIC

	select CLKSRC_NOMADIK_MTU

	select COMMON_CLK

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_CACHE_L2X0

	select USE_OF

	select PINCTRL

	select PINCTRL_STN8815

	select SPARSE_IRQ

	help

	  Support for the Nomadik platform by ST-Ericsson



config PLAT_SPEAR

	bool "ST SPEAr"

	select ARCH_HAS_CPUFREQ

arch/arm/Kconfig.debug

+8 −0
Original line number Diff line number Diff line
@@ -298,6 +298,13 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on MVEBU based platforms.



	config DEBUG_NOMADIK_UART

		bool "Kernel low-level debugging messages via NOMADIK UART"

		depends on ARCH_NOMADIK

		help

		  Say Y here if you want kernel low-level debugging support

		  on NOMADIK based platforms.



	config DEBUG_OMAP2PLUS_UART

		bool "Kernel low-level debugging messages via OMAP2PLUS UART"

		depends on ARCH_OMAP2PLUS
@@ -590,6 +597,7 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX6Q_UART

	default "debug/highbank.S" if DEBUG_HIGHBANK_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART

	default "debug/nomadik.S" if DEBUG_NOMADIK_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART

	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART

arch/arm/configs/nhk8815_defconfig

+19 −23
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_KALLSYMS_ALL=y
@@ -13,6 +11,7 @@ CONFIG_SLAB=y 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_NOMADIK=y

CONFIG_MACH_NOMADIK_8815NHK=y

CONFIG_PREEMPT=y
@@ -20,7 +19,6 @@ CONFIG_AEABI=y 
CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_FPE_NWFPE=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -32,14 +30,10 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_NET_IPIP=y

CONFIG_NET_IPGRE=y

CONFIG_NET_IPGRE_BROADCAST=y

CONFIG_IP_MROUTE=y

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_BT=m

CONFIG_BT_L2CAP=m

CONFIG_BT_SCO=m

CONFIG_BT_RFCOMM=m

CONFIG_BT_RFCOMM_TTY=y

CONFIG_BT_BNEP=m
@@ -53,14 +47,16 @@ CONFIG_BT_HCIVHCI=m 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_TESTS=m

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ECC_SMC=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_FSMC=y

CONFIG_MTD_ONENAND=y

CONFIG_MTD_ONENAND_VERIFY_WRITE=y

CONFIG_MTD_ONENAND_GENERIC=y

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_CRYPTOLOOP=y

CONFIG_BLK_DEV_RAM=y
@@ -72,47 +68,48 @@ CONFIG_SCSI_CONSTANTS=y 
CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_NETDEVICES=y

CONFIG_NETCONSOLE=m

CONFIG_TUN=y

CONFIG_NET_ETHERNET=y

CONFIG_SMC91X=y

CONFIG_PPP=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPP_MPPE=m

CONFIG_PPPOE=m

CONFIG_NETCONSOLE=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

# CONFIG_MOUSE_PS2 is not set

# CONFIG_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_NOMADIK=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_GPIO=y

CONFIG_I2C_NOMADIK=y

CONFIG_DEBUG_GPIO=y

CONFIG_PINCTRL_NOMADIK=y

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

CONFIG_MMC=y

CONFIG_MMC_CLKGATE=y

CONFIG_MMC_ARMMMCI=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_PL031=y

CONFIG_DMADEVICES=y

CONFIG_AMBA_PL08X=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_INOTIFY=y

CONFIG_FUSE_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_ROOT_NFS=y

CONFIG_SMB_FS=m

CONFIG_CIFS=m

CONFIG_CIFS_WEAK_PW_HASH=y

CONFIG_NLS_CODEPAGE_437=y
@@ -120,12 +117,11 @@ CONFIG_NLS_ASCII=y 
CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_15=y

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_FS=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

CONFIG_DEBUG_INFO=y

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_SHA1=y

CONFIG_CRYPTO_DES=y

arch/arm/mach-nomadik/Kconfig

+19 −3
Original line number Diff line number Diff line 
if ARCH_NOMADIK

config ARCH_NOMADIK

	bool "ST-Ericsson Nomadik"

	depends on ARCH_MULTI_V5

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select ARM_VIC

	select CLKSRC_NOMADIK_MTU

	select COMMON_CLK

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_CACHE_L2X0

	select PINCTRL

	select PINCTRL_NOMADIK

	select PINCTRL_STN8815

	select SPARSE_IRQ

	select USE_OF

	help

	  Support for the Nomadik platform by ST-Ericsson



menu "Nomadik boards"
@@ -11,6 +28,5 @@ config MACH_NOMADIK_8815NHK 
endmenu



config NOMADIK_8815

	depends on ARCH_NOMADIK

	bool
 


endif