Commit fd2e1dd7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2 

These are all dependencies for the renesas/boards2 branch.

Conflicts:
	arch/arm/configs/marzen_defconfig
parents 77b67063 ab6f6d85 631a7b5d 86bc52ef

arch/arm/boot/dts/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,8 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb 
dtb-$(CONFIG_ARCH_U8500) += snowball.dtb

dtb-$(CONFIG_ARCH_U8500) += snowball.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

	r8a7740-armadillo800eva.dtb \

	r8a7740-armadillo800eva.dtb \

	sh73a0-kzm9g.dtb

	sh73a0-kzm9g.dtb \

	sh7372-mackerel.dtb

dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \

dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \

	spear1340-evb.dtb

	spear1340-evb.dtb

dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \

dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \

arch/arm/boot/dts/sh7377.dtsi→arch/arm/boot/dts/sh7372-mackerel.dts

+7 −6
Original line number Original line Diff line number Diff line 
/*

/*

 * Device Tree Source for the sh7377 SoC

 * Device Tree Source for the mackerel board

 *

 *

 * Copyright (C) 2012 Renesas Solutions Corp.

 * Copyright (C) 2012 Renesas Solutions Corp.

 *

 *
@@ -8,14 +8,15 @@ 
 * kind, whether express or implied.

 * kind, whether express or implied.

 */

 */





/dts-v1/;

/include/ "skeleton.dtsi"

/include/ "skeleton.dtsi"





/ {

/ {

	compatible = "renesas,sh7377";

	model = "Mackerel (AP4 EVM 2nd)";

	compatible = "renesas,mackerel";





	cpus {

	memory {

		cpu@0 {

		device_type = "memory";

			compatible = "arm,cortex-a8";

		reg = <0x40000000 0x10000000>;

		};

	};

	};

};
 
};

arch/arm/configs/armadillo800eva_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ CONFIG_LOG_BUF_SHIFT=16 
# CONFIG_IPC_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_PID_NS is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_UNLOAD=y

arch/arm/configs/g3evm_defconfig

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

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_BLK_DEV_INITRD=y

CONFIG_SLAB=y

# 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_SH7367=y

CONFIG_MACH_G3EVM=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttySC1,115200 earlyprintk=sh-sci.1,115200"

CONFIG_KEXEC=y

CONFIG_PM=y

# CONFIG_SUSPEND is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_MTD=y

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_NAND=y

# CONFIG_BLK_DEV is not set

# CONFIG_MISC_DEVICES is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=8

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_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_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_DETECT_SOFTLOCKUP is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_FTRACE is not set

# CONFIG_CRC32 is not set

arch/arm/configs/g4evm_defconfig

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

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_BLK_DEV_INITRD=y

CONFIG_SLAB=y

# 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_SH7377=y

CONFIG_MACH_G4EVM=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=ttySC4,115200 earlyprintk=sh-sci.4,115200"

CONFIG_KEXEC=y

CONFIG_PM=y

# CONFIG_SUSPEND is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_MTD=y

CONFIG_MTD_CONCAT=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_NAND=y

# CONFIG_BLK_DEV is not set

# CONFIG_MISC_DEVICES is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=8

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_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_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_DETECT_SOFTLOCKUP is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_FTRACE is not set

# CONFIG_CRC32 is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE