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

Commit 7d354e40 authored by Ryan Mallon's avatar Ryan Mallon Committed by Russell King
Browse files

ARM: 6932/1: SPEAr3xx: Replace defconfigs with single unified defconfig 



We only need one defconfig for SPEAr3xx now since we can build all
three boards into one kernel.

Reviewed-by: default avatarStanley Miao <stanley.miao@windriver.com>
Signed-off-by: default avatarRyan Mallon <ryan@bluewatersys.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@st.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 558d774a

arch/arm/configs/spear310_defconfig

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

CONFIG_SYSVIPC=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_KALLSYMS_EXTRA_PASS=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_PLAT_SPEAR=y

CONFIG_MACH_SPEAR310=y

CONFIG_BINFMT_MISC=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=16384

CONFIG_INPUT_FF_MEMLESS=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE 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_RAW_DRIVER=y

CONFIG_MAX_RAW_DEVS=8192

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_PL061=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_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_AUTOFS4_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_FAT_DEFAULT_IOCHARSET="ascii"

CONFIG_TMPFS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="utf8"

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_SPINLOCK_SLEEP=y

CONFIG_DEBUG_INFO=y

# CONFIG_CRC32 is not set

arch/arm/configs/spear320_defconfig

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

CONFIG_SYSVIPC=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_KALLSYMS_EXTRA_PASS=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_PLAT_SPEAR=y

CONFIG_MACH_SPEAR320=y

CONFIG_BINFMT_MISC=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=16384

CONFIG_INPUT_FF_MEMLESS=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE 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_RAW_DRIVER=y

CONFIG_MAX_RAW_DEVS=8192

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_PL061=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_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT3_FS=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_AUTOFS4_FS=m

CONFIG_MSDOS_FS=m

CONFIG_VFAT_FS=m

CONFIG_FAT_DEFAULT_IOCHARSET="ascii"

CONFIG_TMPFS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_NLS=y

CONFIG_NLS_DEFAULT="utf8"

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=m

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_SPINLOCK_SLEEP=y

CONFIG_DEBUG_INFO=y

# CONFIG_CRC32 is not set

arch/arm/configs/spear300_defconfig→arch/arm/configs/spear3xx_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_PLAT_SPEAR=y

CONFIG_BOARD_SPEAR300_EVB=y

CONFIG_BOARD_SPEAR310_EVB=y

CONFIG_BOARD_SPEAR320_EVB=y

CONFIG_BINFMT_MISC=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_RAM=y
@@ -24,7 +27,6 @@ CONFIG_MAX_RAW_DEVS=8192 
CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_PL061=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