vt8500: Remove arm/boot/compressed/head-vt8500.S
authorTony Prisk <linux@prisktech.co.nz>
Sat, 6 Oct 2012 06:53:08 +0000 (19:53 +1300)
committerTony Prisk <linux@prisktech.co.nz>
Mon, 15 Oct 2012 01:04:41 +0000 (14:04 +1300)
Converting arch-vt8500 to devicetree-only makes this file redundant.

Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
arch/arm/boot/compressed/Makefile
arch/arm/boot/compressed/head-vt8500.S [deleted file]

index a517153a13eabdad582b6b6f75080cf93f699595..537208f22e564db68de821ca2908b18d3ed281c6 100644 (file)
@@ -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 (file)
index 1dc1e21..0000000
+++ /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: