diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-03-05 00:55:23 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-05 00:56:06 +0300 |
| commit | 605e0f904bb6b9ba13f8d7918f3c016ac00b86bc (patch) | |
| tree | 1708074148678df0abd2b86038489de08bfbf336 /arch/arm/Kconfig | |
| parent | 756c08b068712dec875614f27ccbc38fdeda4fe7 (diff) | |
| parent | c6535e1e0361157ea073b57b626d0611b7c4c7a0 (diff) | |
| download | linux-605e0f904bb6b9ba13f8d7918f3c016ac00b86bc.tar.xz | |
Merge tag 'renesas-sh7372-soc-removal-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/multiplatform
Pull "Renesas ARM Based SoC sh7372 SoC Removal Updates for v4.1" from Simon Horman:
* Remove the sh7372 SoC and its mackerel board
* tag 'renesas-sh7372-soc-removal-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
Documentation: Remove ZBOOT MMC/SDHI utility and docs
ARM: shmobile: sh7372 dtsi: Remove Legacy DTSI file
ARM: shmobile: sh7372: Remove DT binding documentation
ARM: shmobile: sh7372: Remove Legacy C SoC code
ARM: shmobile: sh7372: Remove ZBOOT MMC/SDHI support
ARM: shmobile: mackerel: Remove from MAINTAINERS
ARM: shmobile: mackerel: Remove defconfig
ARM: shmobile: mackerel: Remove mach-type entry
ARM: shmobile: mackerel: Remove DT binding documentation
ARM: shmobile: mackerel dts: Remove Legacy DTS file
ARM: shmobile: mackerel: Remove Legacy C board code
ARM: shmobile: mackerel: Remove ZBOOT code
[arnd: The sh7372 platform is rather dated and is believed to
have no active users on modern kernels. It stands in the way
of converting all of mach-shmobile to be multiplatform capable,
as adding pinctrl and common-clock support for it would be more
work than it's worth. As always, should any legitimate upstream
users show up in the future, we will revert this removal]
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 495fb7ace4d8..55f1d9ba4b20 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1847,35 +1847,6 @@ config ZBOOT_ROM Say Y here if you intend to execute your compressed kernel image (zImage) directly from ROM or flash. If unsure, say N. -choice - prompt "Include SD/MMC loader in zImage (EXPERIMENTAL)" - depends on ZBOOT_ROM && ARCH_SH7372 - default ZBOOT_ROM_NONE - help - Include experimental SD/MMC loading code in the ROM-able zImage. - With this enabled it is possible to write the ROM-able zImage - kernel image to an MMC or SD card and boot the kernel straight - from the reset vector. At reset the processor Mask ROM will load - the first part of the ROM-able zImage which in turn loads the - rest the kernel image to RAM. - -config ZBOOT_ROM_NONE - bool "No SD/MMC loader in zImage (EXPERIMENTAL)" - help - Do not load image from SD or MMC - -config ZBOOT_ROM_MMCIF - bool "Include MMCIF loader in zImage (EXPERIMENTAL)" - help - Load image from MMCIF hardware block. - -config ZBOOT_ROM_SH_MOBILE_SDHI - bool "Include SuperH Mobile SDHI loader in zImage (EXPERIMENTAL)" - help - Load image from SDHI hardware block - -endchoice - config ARM_APPENDED_DTB bool "Use appended device tree blob to zImage (EXPERIMENTAL)" depends on OF |