summaryrefslogtreecommitdiff
path: root/arch/arm/boot/compressed/head-shmobile.S
diff options
context:
space:
mode:
authorMagnus Damm <damm+renesas@opensource.se>2015-01-26 15:19:09 +0900
committerSimon Horman <horms+renesas@verge.net.au>2015-02-24 06:45:24 +0900
commit10c7fcbd0f00a0d7e6039fcfcb04dca80c0ff362 (patch)
tree9317b0215547c715677527afa3aa5a3734ab8d38 /arch/arm/boot/compressed/head-shmobile.S
parentd1e068fd24c399d26880456eb5e117a188d4ce70 (diff)
downloadlwn-10c7fcbd0f00a0d7e6039fcfcb04dca80c0ff362.tar.gz
lwn-10c7fcbd0f00a0d7e6039fcfcb04dca80c0ff362.zip
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>
Diffstat (limited to 'arch/arm/boot/compressed/head-shmobile.S')
-rw-r--r--arch/arm/boot/compressed/head-shmobile.S30
1 files changed, 0 insertions, 30 deletions
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}