From 953fa6c69c4bb10d5377e2045dc21de9b9d9b1b3 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Mon, 2 May 2016 23:26:50 +0200 Subject: linux-kexecboot_4.4: fix defconfig for collie On collie F2FS has been removed to fit in the max kernel size. Signed-off-by: Andrea Adami --- .../linux/linux-kexecboot-4.4/collie/defconfig | 28 +++++++++++++++------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/recipes-kernel/linux/linux-kexecboot-4.4/collie/defconfig b/recipes-kernel/linux/linux-kexecboot-4.4/collie/defconfig index dea598b..ddfc52b 100644 --- a/recipes-kernel/linux/linux-kexecboot-4.4/collie/defconfig +++ b/recipes-kernel/linux/linux-kexecboot-4.4/collie/defconfig @@ -36,11 +36,11 @@ CONFIG_SLOB=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=y # CONFIG_EFI_PARTITION is not set +# CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_SA1100=y CONFIG_SA1100_COLLIE=y CONFIG_PCCARD=y -# CONFIG_PCMCIA_LOAD_CIS is not set CONFIG_PCMCIA_SA1100=y CONFIG_AEABI=y # CONFIG_CPU_SW_DOMAIN_PAN is not set @@ -53,11 +53,14 @@ CONFIG_KEXEC=y # CONFIG_CPU_FREQ_STAT is not set # CONFIG_BINFMT_SCRIPT is not set # CONFIG_COREDUMP is not set -CONFIG_APM_EMULATION=y +# CONFIG_SUSPEND is not set +# CONFIG_UEVENT_HELPER is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_FW_LOADER is not set +# CONFIG_FIRMWARE_IN_KERNEL is not set +# CONFIG_ALLOW_DEV_COREDUMP is not set CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_ADV_OPTIONS=y @@ -65,11 +68,13 @@ CONFIG_MTD_CFI_GEOMETRY=y # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set # CONFIG_MTD_MAP_BANK_WIDTH_2 is not set # CONFIG_MTD_CFI_I1 is not set +CONFIG_MTD_OTP=y CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_ROM=y CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=y CONFIG_MTD_SA1100=y CONFIG_MTD_UBI=y -CONFIG_BLK_DEV_LOOP=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_LOWLEVEL is not set @@ -79,15 +84,15 @@ CONFIG_ATA=y CONFIG_PATA_PCMCIA=y # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_APMPOWER=y # CONFIG_KEYBOARD_ATKBD is not set CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_LOCOMO=y # CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_SERIO is not set +# CONFIG_CONSOLE_TRANSLATIONS is not set # CONFIG_UNIX98_PTYS is not set # CONFIG_LEGACY_PTYS is not set +# CONFIG_DEVMEM is not set # CONFIG_DEVKMEM is not set CONFIG_SERIAL_SA1100=y CONFIG_SERIAL_SA1100_CONSOLE=y @@ -99,7 +104,6 @@ CONFIG_SPI=y CONFIG_SPI_LOCOMO=y CONFIG_GPIO_LOCOMO=y CONFIG_POWER_SUPPLY=y -CONFIG_APM_POWER=y CONFIG_BATTERY_COLLIE=y CONFIG_CHARGER_GPIO=y # CONFIG_HWMON is not set @@ -107,9 +111,12 @@ CONFIG_MFD_LOCOMO=y CONFIG_MCP_SA11X0=y CONFIG_MCP_UCB1200=y CONFIG_MCP_UCB1200_TS=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_FB=y CONFIG_FB_SA1100=y CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_LOCOMO=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y @@ -123,13 +130,17 @@ CONFIG_MMC_SPI=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_LOCOMO=y +CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_RTC_CLASS=y # CONFIG_RTC_SYSTOHC is not set CONFIG_RTC_DRV_SA1100=y CONFIG_DMADEVICES=y CONFIG_DMA_SA11X0=y +# CONFIG_IOMMU_SUPPORT is not set +CONFIG_M62332=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_FILE_LOCKING is not set @@ -150,7 +161,8 @@ CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_FRAME_WARN=2048 +# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_SCHED_DEBUG is not set # CONFIG_FTRACE is not set # CONFIG_ARM_UNWIND is not set -- cgit 1.2.3-korg