diff options
| author | Tony Prisk <linux@prisktech.co.nz> | 2012-10-06 19:53:08 +1300 |
|---|---|---|
| committer | Tony Prisk <linux@prisktech.co.nz> | 2012-10-15 14:04:41 +1300 |
| commit | 227f00412fc1e4d102d8642e9a01ad6eb737820f (patch) | |
| tree | 88f254865af8b7dc0fcaf83292778ea96fadd57a /arch/arm/boot/compressed | |
| parent | 85deaa8dcdff4a52c43ac0335011afbb7ce7cde8 (diff) | |
| download | linux-3.10-227f00412fc1e4d102d8642e9a01ad6eb737820f.tar.gz linux-3.10-227f00412fc1e4d102d8642e9a01ad6eb737820f.tar.bz2 linux-3.10-227f00412fc1e4d102d8642e9a01ad6eb737820f.zip | |
vt8500: Remove arm/boot/compressed/head-vt8500.S
Converting arch-vt8500 to devicetree-only makes this file redundant.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
Diffstat (limited to 'arch/arm/boot/compressed')
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/boot/compressed/head-vt8500.S | 46 |
2 files changed, 0 insertions, 50 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index a517153a13e..537208f22e5 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -54,10 +54,6 @@ ifeq ($(CONFIG_ARCH_SA1100),y) OBJS += head-sa1100.o endif -ifeq ($(CONFIG_ARCH_VT8500),y) -OBJS += head-vt8500.o -endif - ifeq ($(CONFIG_CPU_XSCALE),y) OBJS += head-xscale.o endif diff --git a/arch/arm/boot/compressed/head-vt8500.S b/arch/arm/boot/compressed/head-vt8500.S deleted file mode 100644 index 1dc1e21a3be..00000000000 --- a/arch/arm/boot/compressed/head-vt8500.S +++ /dev/null @@ -1,46 +0,0 @@ -/* - * linux/arch/arm/boot/compressed/head-vt8500.S - * - * Copyright (C) 2010 Alexey Charkov <alchark@gmail.com> - * - * VIA VT8500 specific tweaks. This is merged into head.S by the linker. - * - */ - -#include <linux/linkage.h> -#include <asm/mach-types.h> - - .section ".start", "ax" - -__VT8500_start: - @ Compare the SCC ID register against a list of known values - ldr r1, .SCCID - ldr r3, [r1] - - @ VT8500 override - ldr r4, .VT8500SCC - cmp r3, r4 - ldreq r7, .ID_BV07 - beq .Lendvt8500 - - @ WM8505 override - ldr r4, .WM8505SCC - cmp r3, r4 - ldreq r7, .ID_8505 - beq .Lendvt8500 - - @ Otherwise, leave the bootloader's machine id untouched - -.SCCID: - .word 0xd8120000 -.VT8500SCC: - .word 0x34000102 -.WM8505SCC: - .word 0x34260103 - -.ID_BV07: - .word MACH_TYPE_BV07 -.ID_8505: - .word MACH_TYPE_WM8505_7IN_NETBOOK - -.Lendvt8500: |