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

Commit 95e0d11f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'defconfig2' of... 

Merge branch 'defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

From Simon Horman, two more defconfig updates for shmobile.

* 'defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: mach-shmobile: mackerel:  enable VFP in defconfig
  ARM: mach-shmobile: armadillo: defconfig: Enable CEU
parents 4b3c3be0 46bbd43f

arch/arm/configs/armadillo800eva_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -90,14 +90,11 @@ CONFIG_I2C_SH_MOBILE=y 
# CONFIG_HWMON is not set

CONFIG_MEDIA_SUPPORT=y

CONFIG_VIDEO_DEV=y

# CONFIG_RC_CORE is not set

# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set

# CONFIG_V4L_USB_DRIVERS is not set

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_MT9T112=y

CONFIG_VIDEO_SH_MOBILE_CEU=y

# CONFIG_RADIO_ADAPTERS is not set

CONFIG_FB=y

CONFIG_FB_SH_MOBILE_LCDC=y

CONFIG_FB_SH_MOBILE_HDMI=y

arch/arm/configs/mackerel_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 
CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_KEXEC=y

CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM=y

CONFIG_PM_RUNTIME=y