Commit 86dd04a2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-koelsch-board-removal-for-v3.19' of... 

Merge tag 'renesas-koelsch-board-removal-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Pull "Renesas ARM Based SoC Koelsch Board Removal Updates for v3.19" from Simon Horman:

* Remove lecacy C koelsh board support

* tag 'renesas-koelsch-board-removal-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: koelsch dts: Drop console= bootargs parameter
  ARM: dts: koelsch: Stop building r8a7791-koelsch.dtb in legacy builds
  MAINTAINERS: Remove reference to shmobile / koelsch_defconfig
  ARM: shmobile: koelsch: Remove reference board code
  ARM: shmobile: r8a7791: Remove legacy code
  ARM: shmobile: koelsch: Remove legacy C board code
  ARM: shmobile: Remove shmobile_clk_workaround() implementation

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 21220a7a 79e69d17

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1381,7 +1381,6 @@ F: arch/arm/boot/dts/sh* 
F:	arch/arm/configs/ape6evm_defconfig

F:	arch/arm/configs/armadillo800eva_defconfig

F:	arch/arm/configs/bockw_defconfig

F:	arch/arm/configs/koelsch_defconfig

F:	arch/arm/configs/kzm9g_defconfig

F:	arch/arm/configs/lager_defconfig

F:	arch/arm/configs/mackerel_defconfig

arch/arm/boot/dts/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -384,7 +384,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \ 
	r8a7778-bockw-reference.dtb \

	r8a7779-marzen.dtb \

	r8a7790-lager.dtb \

	r8a7791-koelsch.dtb \

	sh7372-mackerel.dtb \

	sh73a0-kzm9g.dtb \

	sh73a0-kzm9g-reference.dtb

arch/arm/boot/dts/r8a7791-koelsch.dts

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
	};



	chosen {

		bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";

		bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";

		stdout-path = &scif0;

	};

arch/arm/configs/koelsch_defconfig

deleted100644 → 0
+0 −113
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_ARCH_SHMOBILE_LEGACY=y

CONFIG_ARCH_R8A7791=y

CONFIG_MACH_KOELSCH=y

# CONFIG_SWP_EMULATE is not set

CONFIG_CPU_BPREDICT_DISABLE=y

CONFIG_PL310_ERRATA_588369=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_PCI=y

CONFIG_PCI_RCAR_GEN2=y

CONFIG_PCI_RCAR_GEN2_PCIE=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_NR_CPUS=8

CONFIG_AEABI=y

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_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_SD=y

CONFIG_ATA=y

CONFIG_SATA_RCAR=y

CONFIG_MTD=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_SPI_NOR=y

CONFIG_EEPROM_AT24=y

CONFIG_NETDEVICES=y

# 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_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=20

CONFIG_SERIAL_SH_SCI_CONSOLE=y

CONFIG_I2C=y

CONFIG_I2C_MUX=y

CONFIG_I2C_SH_MOBILE=y

CONFIG_I2C_RCAR=y

CONFIG_SPI=y

CONFIG_SPI_RSPI=y

CONFIG_SPI_SH_MSIOF=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_RCAR=y

# CONFIG_HWMON is not set

CONFIG_THERMAL=y

CONFIG_RCAR_THERMAL=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_DA9210=y

CONFIG_REGULATOR_GPIO=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_PLATFORM=y

CONFIG_VIDEO_RCAR_VIN=y

# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set

CONFIG_VIDEO_ADV7180=y

# CONFIG_HID is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_SDHI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_DNOTIFY is not set

CONFIG_TMPFS=y

CONFIG_CONFIGFS_FS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

# CONFIG_ARM_UNWIND is not set

arch/arm/configs/shmobile_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ CONFIG_ARCH_R8A7779=y 
CONFIG_ARCH_R8A7790=y

CONFIG_ARCH_R8A7791=y

CONFIG_ARCH_R8A7794=y

CONFIG_MACH_KOELSCH=y

CONFIG_MACH_LAGER=y

CONFIG_MACH_MARZEN=y

# CONFIG_SWP_EMULATE is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE