Commit 38e67641 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-defconfig-for-v3.14' of... 

Merge tag 'renesas-defconfig-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

From Simon Horman:
Renesas ARM based SoC defconfig updates for v3.14

* Add Genmai defconfig
  - The board was added in v3.13 but the defconfig missed the cut
* Enable AUTO_ZRELADDR for kzm9d board
* Enable HPB-DMAC, PACKET, VFP on bockw and marzen boards
* Do not disable INOTIFY_USER on bockw or marzen boards
* Do not enable CONFIG_DEVTMPFS on bockw or marzen boards
* Do not enable CONFIG_SMC911X on marzen
  - That hardware does not exist on the marzen board
* Do not set command line on bockw or marzen boards
  - This is handled in the DTS
* Enable REGULATOR on bockw board

* tag 'renesas-defconfig-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: kzm9d: Enable AUTO_ZRELADDR in defconfig
  ARM: shmobile: bockw: enable HPB-DMAC in defconfig
  ARM: shmobile: marzen: enable HPB-DMAC in defconfig
  ARM: shmobile: marzen: Do not enable CONFIG_SMC911X in defconfig
  ARM: shmobile: marzen: Enable CONFIG_PACKET in defconfig
  ARM: shmobile: bockw: Enable CONFIG_PACKET in defconfig
  ARM: shmobile: marzen: Do not enable CONFIG_DEVTMPFS defconfig
  ARM: shmobile: bockw: Do not enable CONFIG_DEVTMPFS defconfig
  ARM: shmobile: marzen: Enable CONFIG_VFP in defconfig
  ARM: shmobile: bockw: Enable CONFIG_VFP in defconfig
  ARM: shmobile: marzen: Do not disable CONFIG_INOTIFY_USER in defconfig
  ARM: shmobile: bockw: Do not disable CONFIG_INOTIFY_USER in defconfig
  ARM: shmobile: marzen: Do not set command line in defconfig
  ARM: shmobile: bockw: Do not set command line in defconfig
  ARM: shmobile: bockw: enable CONFIG_REGULATOR
  ARM: shmobile: Genmai defconfig

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents dc1ccc48 577092b3

arch/arm/configs/bockw_defconfig

+5 −5
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ CONFIG_HIGHMEM=y 
CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_CMDLINE="console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp"

CONFIG_CMDLINE_FORCE=y

CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SUSPEND is not set

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y
@@ -44,8 +44,6 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FW_LOADER is not set
@@ -82,6 +80,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y 
# CONFIG_HWMON is not set

CONFIG_I2C=y

CONFIG_I2C_RCAR=y

CONFIG_REGULATOR=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y
@@ -108,11 +107,12 @@ CONFIG_MMC_SDHI=y 
CONFIG_MMC_SH_MMCIF=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_RX8581=y

CONFIG_DMADEVICES=y

CONFIG_RCAR_HPB_DMAE=y

CONFIG_UIO=y

CONFIG_UIO_PDRV_GENIRQ=y

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

arch/arm/configs/genmai_defconfig

0 → 100644
+116 −0
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_SHMOBILE=y

CONFIG_ARCH_R7S72100=y

CONFIG_MACH_GENMAI=y

# CONFIG_SH_TIMER_CMT is not set

# CONFIG_SH_TIMER_MTU2 is not set

# CONFIG_SH_TIMER_TMU is not set

# CONFIG_EM_TIMER_STI is not set

CONFIG_ARM_ERRATA_430973=y

CONFIG_ARM_ERRATA_458693=y

CONFIG_ARM_ERRATA_460075=y

CONFIG_ARM_ERRATA_743622=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_FORCE_MAX_ZONEORDER=13

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_KEXEC=y

CONFIG_AUTO_ZRELADDR=y

CONFIG_VFP=y

CONFIG_NEON=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_NETDEVICES=y

# CONFIG_NET_CORE is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CIRRUS is not set

# CONFIG_NET_VENDOR_FARADAY is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

CONFIG_SH_ETH=y

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=10

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C_SH_MOBILE=y

# CONFIG_HWMON is not set

CONFIG_THERMAL=y

CONFIG_RCAR_THERMAL=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_DRM=y

CONFIG_DRM_RCAR_DU=y

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_SDHI=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_DMADEVICES=y

CONFIG_SH_DMAE=y

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_DNOTIFY is not set

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_CONFIGFS_FS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFS_V4_1=y

CONFIG_ROOT_NFS=y

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_ARM_UNWIND is not set

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

arch/arm/configs/kzm9d_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 
CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_AUTO_ZRELADDR=y

CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_RUNTIME=y

arch/arm/configs/marzen_defconfig

+4 −6
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ CONFIG_HIGHMEM=y 
CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on"

CONFIG_CMDLINE_FORCE=y

CONFIG_VFP=y

CONFIG_KEXEC=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y
@@ -43,8 +43,6 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FW_LOADER is not set
@@ -61,7 +59,6 @@ CONFIG_NETDEVICES=y 
# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SEEQ is not set

CONFIG_SMC911X=y

CONFIG_SMSC911X=y

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_WLAN is not set
@@ -106,11 +103,12 @@ CONFIG_USB_STORAGE=y 
CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_DMADEVICES=y

CONFIG_RCAR_HPB_DMAE=y

CONFIG_UIO=y

CONFIG_UIO_PDRV_GENIRQ=y

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE