ARM: S5P6442: Removing ARCH_S5P6442 (a73ddc61) · Commits · e / devices / android_kernel_sony_msm8994

Documentation/arm/Samsung/Overview.txt

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,6 @@ Introduction
	- S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list		- S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list
	- S3C64XX: S3C6400 and S3C6410		- S3C64XX: S3C6400 and S3C6410
	- S5P6440		- S5P6440
	- S5P6442
	- S5PC100		- S5PC100
	- S5PC110 / S5PV210		- S5PC110 / S5PV210

	@@ -36,7 +35,6 @@ Configuration
	unifying all the SoCs into one kernel.		unifying all the SoCs into one kernel.

	s5p6440_defconfig - S5P6440 specific default configuration		s5p6440_defconfig - S5P6440 specific default configuration
	s5p6442_defconfig - S5P6442 specific default configuration
	s5pc100_defconfig - S5PC100 specific default configuration		s5pc100_defconfig - S5PC100 specific default configuration
	s5pc110_defconfig - S5PC110 specific default configuration		s5pc110_defconfig - S5PC110 specific default configuration
	s5pv210_defconfig - S5PV210 specific default configuration		s5pv210_defconfig - S5PV210 specific default configuration

arch/arm/Kconfig

+2 −14

Original line number	Original line	Diff line number	Diff line
	@@ -736,16 +736,6 @@ config ARCH_S5P64X0
	Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,		Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
	SMDK6450.		SMDK6450.

	config ARCH_S5P6442
	bool "Samsung S5P6442"
	select CPU_V6
	select GENERIC_GPIO
	select HAVE_CLK
	select ARCH_USES_GETTIMEOFFSET
	select HAVE_S3C2410_WATCHDOG if WATCHDOG
	help
	Samsung S5P6442 CPU based systems

	config ARCH_S5PC100		config ARCH_S5PC100
	bool "Samsung S5PC100"		bool "Samsung S5PC100"
	select GENERIC_GPIO		select GENERIC_GPIO
	@@ -995,8 +985,6 @@ endif

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

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

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

	source "arch/arm/mach-s5pv210/Kconfig"		source "arch/arm/mach-s5pv210/Kconfig"
	@@ -1424,7 +1412,7 @@ source kernel/Kconfig.preempt
	config HZ		config HZ
	int		int
	default 200 if ARCH_EBSA110 \|\| ARCH_S3C2410 \|\| ARCH_S5P64X0 \|\| \		default 200 if ARCH_EBSA110 \|\| ARCH_S3C2410 \|\| ARCH_S5P64X0 \|\| \
	ARCH_S5P6442 \|\| ARCH_S5PV210 \|\| ARCH_EXYNOS4		ARCH_S5PV210 \|\| ARCH_EXYNOS4
	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER		default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
	default AT91_TIMER_HZ if ARCH_AT91		default AT91_TIMER_HZ if ARCH_AT91
	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE		default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
	@@ -2010,7 +1998,7 @@ menu "Power management options"
	source "kernel/power/Kconfig"		source "kernel/power/Kconfig"

	config ARCH_SUSPEND_POSSIBLE		config ARCH_SUSPEND_POSSIBLE
	depends on !ARCH_S5P64X0 && !ARCH_S5P6442		depends on !ARCH_S5P64X0
	depends on CPU_ARM920T \|\| CPU_ARM926T \|\| CPU_SA1100 \|\| \		depends on CPU_ARM920T \|\| CPU_ARM926T \|\| CPU_SA1100 \|\| \
	CPU_V6 \|\| CPU_V6K \|\| CPU_V7 \|\| CPU_XSC3 \|\| CPU_XSCALE		CPU_V6 \|\| CPU_V6K \|\| CPU_V7 \|\| CPU_XSC3 \|\| CPU_XSCALE
	def_bool y		def_bool y

arch/arm/Makefile

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -178,7 +178,6 @@ machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2416 s3c2440 s3c24
	machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0		machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0
	machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx		machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx
	machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0		machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0
	machine-$(CONFIG_ARCH_S5P6442) := s5p6442
	machine-$(CONFIG_ARCH_S5PC100) := s5pc100		machine-$(CONFIG_ARCH_S5PC100) := s5pc100
	machine-$(CONFIG_ARCH_S5PV210) := s5pv210		machine-$(CONFIG_ARCH_S5PV210) := s5pv210
	machine-$(CONFIG_ARCH_EXYNOS4) := exynos4		machine-$(CONFIG_ARCH_EXYNOS4) := exynos4

arch/arm/common/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7,7 +7,7 @@ config ARM_VIC
	config ARM_VIC_NR		config ARM_VIC_NR
	int		int
	default 4 if ARCH_S5PV210		default 4 if ARCH_S5PV210
	default 3 if ARCH_S5P6442 \|\| ARCH_S5PC100		default 3 if ARCH_S5PC100
	default 2		default 2
	depends on ARM_VIC		depends on ARM_VIC
	help		help

arch/arm/configs/s5p6442_defconfig

deleted100644 → 0

+0 −65

Original line number	Original line	Diff line number	Diff line
	CONFIG_EXPERIMENTAL=y
	CONFIG_SYSFS_DEPRECATED_V2=y
	CONFIG_BLK_DEV_INITRD=y
	CONFIG_KALLSYMS_ALL=y
	CONFIG_MODULES=y
	CONFIG_MODULE_UNLOAD=y
	# CONFIG_BLK_DEV_BSG is not set
	CONFIG_ARCH_S5P6442=y
	CONFIG_S3C_LOWLEVEL_UART_PORT=1
	CONFIG_MACH_SMDK6442=y
	CONFIG_CPU_32v6K=y
	CONFIG_AEABI=y
	CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc"
	CONFIG_FPE_NWFPE=y
	CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
	# CONFIG_PREVENT_FIRMWARE_BUILD is not set
	CONFIG_BLK_DEV_LOOP=y
	CONFIG_BLK_DEV_RAM=y
	CONFIG_BLK_DEV_RAM_SIZE=8192
	# CONFIG_MISC_DEVICES is not set
	CONFIG_SCSI=y
	CONFIG_BLK_DEV_SD=y
	CONFIG_CHR_DEV_SG=y
	CONFIG_INPUT_EVDEV=y
	# CONFIG_INPUT_KEYBOARD is not set
	# CONFIG_INPUT_MOUSE is not set
	CONFIG_INPUT_TOUCHSCREEN=y
	CONFIG_SERIAL_8250=y
	CONFIG_SERIAL_8250_NR_UARTS=3
	CONFIG_SERIAL_SAMSUNG=y
	CONFIG_SERIAL_SAMSUNG_CONSOLE=y
	CONFIG_HW_RANDOM=y
	# CONFIG_HWMON is not set
	# CONFIG_VGA_CONSOLE is not set
	# CONFIG_HID_SUPPORT is not set
	# CONFIG_USB_SUPPORT is not set
	CONFIG_EXT2_FS=y
	CONFIG_INOTIFY=y
	CONFIG_MSDOS_FS=y
	CONFIG_VFAT_FS=y
	CONFIG_TMPFS=y
	CONFIG_TMPFS_POSIX_ACL=y
	CONFIG_CRAMFS=y
	CONFIG_ROMFS_FS=y
	CONFIG_PARTITION_ADVANCED=y
	CONFIG_BSD_DISKLABEL=y
	CONFIG_SOLARIS_X86_PARTITION=y
	CONFIG_NLS_CODEPAGE_437=y
	CONFIG_NLS_ASCII=y
	CONFIG_NLS_ISO8859_1=y
	CONFIG_MAGIC_SYSRQ=y
	CONFIG_DEBUG_KERNEL=y
	CONFIG_DEBUG_RT_MUTEXES=y
	CONFIG_DEBUG_SPINLOCK=y
	CONFIG_DEBUG_MUTEXES=y
	CONFIG_DEBUG_SPINLOCK_SLEEP=y
	CONFIG_DEBUG_INFO=y
	# CONFIG_RCU_CPU_STALL_DETECTOR is not set
	CONFIG_SYSCTL_SYSCALL_CHECK=y
	# CONFIG_ARM_UNWIND is not set
	CONFIG_DEBUG_USER=y
	CONFIG_DEBUG_ERRORS=y
	CONFIG_DEBUG_LL=y
	CONFIG_DEBUG_S3C_UART=1
	CONFIG_CRC_CCITT=y