ARM: shmobile: sh7372: Remove ZBOOT MMC/SDHI support

Remove the sh7372 implementation and the shared ZBOOT MMC
and SDHI support code from the compressed ARM boot loader.

With this in place it is no longer possible to boot any
self-contained kernel for sh7372 directly from Mask ROM
via SDHI and MMCIF hardware.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

10 files changed, 0 insertions, 765 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9f1f09a2bc9b..5c915e502764 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1848,35 +1848,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
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 3ea230aa94b7..6e1fb2b2ecc7 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -6,21 +6,6 @@
 
 OBJS            =
 
-# Ensure that MMCIF loader code appears early in the image
-# to minimise that number of bocks that have to be read in
-# order to load it.
-ifeq ($(CONFIG_ZBOOT_ROM_MMCIF),y)
-OBJS            += mmcif-sh7372.o
-endif
-
-# Ensure that SDHI loader code appears early in the image
-# to minimise that number of bocks that have to be read in
-# order to load it.
-ifeq ($(CONFIG_ZBOOT_ROM_SH_MOBILE_SDHI),y)
-OBJS            += sdhi-shmobile.o
-OBJS            += sdhi-sh7372.o
-endif
-
 AFLAGS_head.o += -DTEXT_OFFSET=$(TEXT_OFFSET)
 HEAD    = head.o
 OBJS    += misc.o decompress.o
diff --git a/arch/arm/boot/compressed/head-shmobile.S b/arch/arm/boot/compressed/head-shmobile.S
index e7f80928949c..22a75259faa3 100644
--- a/arch/arm/boot/compressed/head-shmobile.S
+++ b/arch/arm/boot/compressed/head-shmobile.S
@@ -25,36 +25,6 @@
         /* load board-specific initialization code */
 #include <mach/zboot.h>
 
-#if defined(CONFIG_ZBOOT_ROM_MMCIF) || defined(CONFIG_ZBOOT_ROM_SH_MOBILE_SDHI)
-        /* Load image from MMC/SD */
-        adr     sp, __tmp_stack + 256
-        ldr     r0, __image_start
-        ldr     r1, __image_end
-        subs    r1, r1, r0
-        ldr     r0, __load_base
-        bl      mmc_loader
-
-        /* Jump to loaded code */
-        ldr     r0, __loaded
-        ldr     r1, __image_start
-        sub     r0, r0, r1
-        ldr     r1, __load_base
-        add     pc, r0, r1
-
-__image_start:
-        .long   _start
-__image_end:
-        .long   _got_end
-__load_base:
-        .long   MEMORY_START + 0x02000000 @ Load at 32Mb into SDRAM
-__loaded:
-        .long   __continue
-        .align
-__tmp_stack:
-        .space  256
-__continue:
-#endif /* CONFIG_ZBOOT_ROM_MMC || CONFIG_ZBOOT_ROM_SH_MOBILE_SDHI */
-
         adr     r0, dtb_info
         ldmia   r0, {r1, r3, r4, r5, r7}
 
diff --git a/arch/arm/boot/compressed/mmcif-sh7372.c b/arch/arm/boot/compressed/mmcif-sh7372.c
deleted file mode 100644
index 672ae95db5c3..000000000000
--- a/arch/arm/boot/compressed/mmcif-sh7372.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * sh7372 MMCIF loader
- *
- * Copyright (C) 2010 Magnus Damm
- * Copyright (C) 2010 Simon Horman
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#include <linux/mmc/sh_mmcif.h>
-#include <linux/mmc/boot.h>
-#include <mach/mmc.h>
-
-#define MMCIF_BASE      (void __iomem *)0xe6bd0000
-
-#define PORT84CR        (void __iomem *)0xe6050054
-#define PORT85CR        (void __iomem *)0xe6050055
-#define PORT86CR        (void __iomem *)0xe6050056
-#define PORT87CR        (void __iomem *)0xe6050057
-#define PORT88CR        (void __iomem *)0xe6050058
-#define PORT89CR        (void __iomem *)0xe6050059
-#define PORT90CR        (void __iomem *)0xe605005a
-#define PORT91CR        (void __iomem *)0xe605005b
-#define PORT92CR        (void __iomem *)0xe605005c
-#define PORT99CR        (void __iomem *)0xe6050063
-
-#define SMSTPCR3        (void __iomem *)0xe615013c
-
-/* SH7372 specific MMCIF loader
- *
- * loads the zImage from an MMC card starting from block 1.
- *
- * The image must be start with a vrl4 header and
- * the zImage must start at offset 512 of the image. That is,
- * at block 2 (=byte 1024) on the media
- *
- * Use the following line to write the vrl4 formated zImage
- * to an MMC card
- * # dd if=vrl4.out of=/dev/sdx bs=512 seek=1
- */
-asmlinkage void mmc_loader(unsigned char *buf, unsigned long len)
-{
-        mmc_init_progress();
-        mmc_update_progress(MMC_PROGRESS_ENTER);
-
-        /* Initialise MMC
-         * registers: PORT84CR-PORT92CR
-         *            (MMCD0_0-MMCD0_7,MMCCMD0 Control)
-         * value: 0x04 - select function 4
-         */
-         __raw_writeb(0x04, PORT84CR);
-         __raw_writeb(0x04, PORT85CR);
-         __raw_writeb(0x04, PORT86CR);
-         __raw_writeb(0x04, PORT87CR);
-         __raw_writeb(0x04, PORT88CR);
-         __raw_writeb(0x04, PORT89CR);
-         __raw_writeb(0x04, PORT90CR);
-         __raw_writeb(0x04, PORT91CR);
-         __raw_writeb(0x04, PORT92CR);
-
-        /* Initialise MMC
-         * registers: PORT99CR (MMCCLK0 Control)
-         * value: 0x10 | 0x04 - enable output | select function 4
-         */