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

Commit 6901bbc8 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: s5pv210_defconfig: Update for removing s5pc110_defconfig 



Now that S5PC110 machines and S5PV210 machines can be built into
one kernel, update mach-s5pv210/Kconfig and s5pv210_defconfig.

Tested on Aquila(S5PC110), GONI(S5PC110), SMDKC110(S5PC110)
and SMDKV210(S5PV210).

Created and tested against linux-2.6.35-rc5.

Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
parent 4b9a5ad5

arch/arm/configs/s5pc110_defconfig

deleted100644 → 0
+0 −66
Original line number 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_S5PV210=y

CONFIG_S3C_LOWLEVEL_UART_PORT=1

CONFIG_MACH_SMDKC110=y

CONFIG_VMSPLIT_2G=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc"

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

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_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_PREEMPT is not set

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_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_DEBUG_S3C_UART=1

CONFIG_CRC_CCITT=y

arch/arm/configs/s5pv210_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -7,6 +7,11 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_S5PV210=y

CONFIG_S3C_LOWLEVEL_UART_PORT=1

CONFIG_S3C_DEV_FB=y

CONFIG_S5PV210_SETUP_FB_24BPP=y

CONFIG_MACH_AQUILA=y

CONFIG_MACH_GONI=y

CONFIG_MACH_SMDKC110=y

CONFIG_MACH_SMDKV210=y

CONFIG_VMSPLIT_2G=y

CONFIG_PREEMPT=y

arch/arm/mach-s5pv210/Kconfig

+19 −13
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ config S5PV210_SETUP_SDHCI_GPIO 
	help

	  Common setup code for SDHCI gpio.



# machine support

menu "S5PC110 Machines"



config MACH_AQUILA

	bool "Samsung Aquila"

	bool "Aquila"

	select CPU_S5PV210

	select ARCH_SPARSEMEM_ENABLE

	select S5PV210_SETUP_FB_24BPP
@@ -71,11 +71,27 @@ config MACH_GONI 
	  Machine support for Samsung GONI board

	  S5PC110(MCP) is one of package option of S5PV210



config MACH_SMDKC110

	bool "SMDKC110"

	select CPU_S5PV210

	select ARCH_SPARSEMEM_ENABLE

	select SAMSUNG_DEV_IDE

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	select S5PV210_SETUP_IDE

	help

	  Machine support for Samsung SMDKC110

	  S5PC110(MCP) is one of package option of S5PV210



endmenu



config S5PC110_DEV_ONENAND

	bool

	help

	  Compile in platform device definition for OneNAND1 controller



menu "S5PV210 Machines"



config MACH_SMDKV210

	bool "SMDKV210"

	select CPU_S5PV210
@@ -89,16 +105,6 @@ config MACH_SMDKV210 
	help

	  Machine support for Samsung SMDKV210



config MACH_SMDKC110

	bool "SMDKC110"

	select CPU_S5PV210

	select ARCH_SPARSEMEM_ENABLE

	select SAMSUNG_DEV_IDE

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	select S5PV210_SETUP_IDE

	help

	  Machine support for Samsung SMDKC110

	  S5PC110(MCP) is one of package option of S5PV210

endmenu



endif