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

Merge branch 'next/spring-cleaning' into next/cleanup

parents 5ed3ebe3 e7b64391

arch/arm/Kconfig

+1 −10
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ config ARCH_GEMINI 
	bool "Cortina Systems Gemini"

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_USES_GETTIMEOFFSET

	select NEED_MACH_GPIO_H

	select CPU_FA526

	help

	  Support for the Cortina Systems Gemini family SoCs
@@ -494,14 +495,6 @@ config ARCH_NETX 
	help

	  This enables support for systems based on the Hilscher NetX Soc



config ARCH_H720X

	bool "Hynix HMS720x-based"

	select ARCH_USES_GETTIMEOFFSET

	select CPU_ARM720T

	select ISA_DMA_API

	help

	  This enables support for systems based on the Hynix HMS720x



config ARCH_IOP13XX

	bool "IOP13xx-based"

	depends on MMU
@@ -1053,8 +1046,6 @@ source "arch/arm/mach-footbridge/Kconfig" 


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



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



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



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

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ machine-$(CONFIG_ARCH_DOVE) += dove 
machine-$(CONFIG_ARCH_EBSA110)		+= ebsa110

machine-$(CONFIG_ARCH_EP93XX)		+= ep93xx

machine-$(CONFIG_ARCH_GEMINI)		+= gemini

machine-$(CONFIG_ARCH_H720X)		+= h720x

machine-$(CONFIG_ARCH_HIGHBANK)		+= highbank

machine-$(CONFIG_ARCH_INTEGRATOR)	+= integrator

machine-$(CONFIG_ARCH_IOP13XX)		+= iop13xx

arch/arm/configs/h7201_defconfig

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_MODULES=y

CONFIG_ARCH_H720X=y

CONFIG_ARCH_H7201=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_FPE_NWFPE=y

CONFIG_MTD=y

CONFIG_MTD_DEBUG=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_VGA_CONSOLE is not set

CONFIG_SOUND=m

CONFIG_EXT2_FS=y

CONFIG_JFFS2_FS=y

CONFIG_DEBUG_USER=y

arch/arm/configs/h7202_defconfig

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_MODULES=y

CONFIG_ARCH_H720X=y

CONFIG_ARCH_H7202=y

# CONFIG_ARM_THUMB is not set

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttyS0,19200"

CONFIG_FPE_NWFPE=y

CONFIG_FPE_NWFPE_XP=y

CONFIG_NET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_BOOTP=y

# CONFIG_IPV6 is not set

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_H720X=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_FB=y

CONFIG_FB_MODE_HELPERS=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_USB_GADGET=m

CONFIG_USB_ZERO=m

CONFIG_USB_GADGETFS=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_EXT2_FS=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y

arch/arm/mach-gemini/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


# Object file lists.



obj-y			:= irq.o mm.o time.o devices.o gpio.o idle.o

obj-y			:= irq.o mm.o time.o devices.o gpio.o idle.o reset.o



# Board-specific support

obj-$(CONFIG_MACH_NAS4220B)	+= board-nas4220b.o