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

Commit 4b60e5f9 authored by Russell King's avatar Russell King
Browse files

Merge branches 'consolidate-clksrc', 'consolidate-flash',... 

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
parents e8765afe 667f390b a35d4e58 4d5336d5 041f10d4 be20902b

arch/arm/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -381,16 +381,6 @@ config ARCH_MXS 
	help

	  Support for Freescale MXS-based family of processors



config ARCH_STMP3XXX

	bool "Freescale STMP3xxx"

	select CPU_ARM926T

	select CLKDEV_LOOKUP

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS

	select USB_ARCH_HAS_EHCI

	help

	  Support for systems based on the Freescale 3xxx CPUs.



config ARCH_NETX

	bool "Hilscher NetX based"

	select CLKSRC_MMIO
@@ -1018,8 +1008,6 @@ source "arch/arm/mach-exynos4/Kconfig" 


source "arch/arm/mach-shmobile/Kconfig"



source "arch/arm/plat-stmp3xxx/Kconfig"



source "arch/arm/mach-tegra/Kconfig"



source "arch/arm/mach-u300/Kconfig"

arch/arm/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -185,8 +185,6 @@ machine-$(CONFIG_ARCH_EXYNOS4) := exynos4 
machine-$(CONFIG_ARCH_SA1100)		:= sa1100

machine-$(CONFIG_ARCH_SHARK)		:= shark

machine-$(CONFIG_ARCH_SHMOBILE) 	:= shmobile

machine-$(CONFIG_ARCH_STMP378X)		:= stmp378x

machine-$(CONFIG_ARCH_STMP37XX)		:= stmp37xx

machine-$(CONFIG_ARCH_TCC8K)		:= tcc8k

machine-$(CONFIG_ARCH_TEGRA)		:= tegra

machine-$(CONFIG_ARCH_U300)		:= u300
@@ -207,7 +205,6 @@ machine-$(CONFIG_MACH_SPEAR600) := spear6xx 
plat-$(CONFIG_ARCH_MXC)		:= mxc

plat-$(CONFIG_ARCH_OMAP)	:= omap

plat-$(CONFIG_ARCH_S3C64XX)	:= samsung

plat-$(CONFIG_ARCH_STMP3XXX)	:= stmp3xxx

plat-$(CONFIG_ARCH_TCC_926)	:= tcc

plat-$(CONFIG_PLAT_IOP)		:= iop

plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik

arch/arm/common/sa1111.c

+0 −8
Original line number Diff line number Diff line
@@ -185,14 +185,6 @@ static struct sa1111_dev_info sa1111_devices[] = { 
	},

};



void __init sa1111_adjust_zones(unsigned long *size, unsigned long *holes)

{

	unsigned int sz = SZ_1M >> PAGE_SHIFT;



	size[1] = size[0] - sz;

	size[0] = sz;

}



/*

 * SA1111 interrupt support.  Since clearing an IRQ while there are

 * active IRQs causes the interrupt output to pulse, the upper levels

arch/arm/configs/mxs_defconfig

0 → 100644
+129 −0
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_TASKSTATS=y

CONFIG_TASK_DELAY_ACCT=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

# CONFIG_UTS_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_PERF_EVENTS=y

# CONFIG_COMPAT_BRK is not set

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_BLK_DEV_INTEGRITY=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_MXS=y

CONFIG_MACH_STMP378X_DEVB=y

CONFIG_MACH_TX28=y

# CONFIG_ARM_THUMB is not set

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_AEABI=y

CONFIG_DEFAULT_MMAP_MIN_ADDR=65536

CONFIG_AUTO_ZRELADDR=y

CONFIG_FPE_NWFPE=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_SYN_COOKIES=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_CAN=m

CONFIG_CAN_RAW=m

CONFIG_CAN_BCM=m

CONFIG_CAN_DEV=m

CONFIG_CAN_FLEXCAN=m

# CONFIG_WIRELESS is not set

CONFIG_DEVTMPFS=y

# CONFIG_FIRMWARE_IN_KERNEL is not set

# CONFIG_BLK_DEV is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_ENC28J60=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=m

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_TSC2007=m

# CONFIG_SERIO is not set

CONFIG_VT_HW_CONSOLE_BINDING=y

CONFIG_DEVPTS_MULTIPLE_INSTANCES=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=m

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=m

CONFIG_I2C_MXS=m

CONFIG_SPI=y

CONFIG_SPI_GPIO=m

CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

# CONFIG_MFD_SUPPORT is not set

CONFIG_DISPLAY_SUPPORT=m

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_MXS=y

CONFIG_RTC_CLASS=m

CONFIG_RTC_DRV_DS1307=m

CONFIG_DMADEVICES=y

CONFIG_MXS_DMA=y

CONFIG_EXT3_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_FSCACHE=m

CONFIG_FSCACHE_STATS=y

CONFIG_CACHEFILES=m

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_PRINTK_TIME=y

CONFIG_FRAME_WARN=2048

CONFIG_MAGIC_SYSRQ=y

CONFIG_UNUSED_SYMBOLS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_TIMER_STATS=y

CONFIG_PROVE_LOCKING=y

CONFIG_DEBUG_SPINLOCK_SLEEP=y

CONFIG_DEBUG_INFO=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_STRICT_DEVMEM=y

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO=y

CONFIG_CRYPTO_CRC32C=m

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC_ITU_T=m

CONFIG_CRC7=m

arch/arm/configs/realview-smp_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ CONFIG_MTD_BLOCK=y 
CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_ARM_INTEGRATOR=y

CONFIG_MTD_PHYSMAP=y

CONFIG_ARM_CHARLCD=y

CONFIG_NETDEVICES=y

CONFIG_SMSC_PHY=y