From: linux@prisktech.co.nz (Tony Prisk)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] vt8500: Remove arm/boot/compressed/head-vt8500.S
Date: Sun, 7 Oct 2012 14:02:12 +1300 [thread overview]
Message-ID: <1349571734-26233-3-git-send-email-linux@prisktech.co.nz> (raw)
In-Reply-To: <1349571734-26233-1-git-send-email-linux@prisktech.co.nz>
Converting arch-vt8500 to devicetree-only makes this file redundant.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
---
arch/arm/boot/compressed/Makefile | 4 ---
arch/arm/boot/compressed/head-vt8500.S | 46 --------------------------------
2 files changed, 50 deletions(-)
delete mode 100644 arch/arm/boot/compressed/head-vt8500.S
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index bb26756..0bc7a16 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -50,10 +50,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 1dc1e21..0000000
--- 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:
--
1.7.9.5
next prev parent reply other threads:[~2012-10-07 1:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-07 1:02 [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7 Tony Prisk
2012-10-07 1:02 ` [PATCH 1/4] vt8500: Remove unused headers from include/mach/ Tony Prisk
2012-10-07 1:02 ` Tony Prisk [this message]
2012-10-07 1:02 ` [PATCH 3/4] vt8500: Fix header in mach-vt8500/timer.c Tony Prisk
2012-10-07 1:02 ` [PATCH 4/4] vt8500: Fix build warning when no framebuffer selected Tony Prisk
2012-10-07 11:23 ` [PATCH 0/4] arm-soc: vt8500: Cleanup patches for 3.7 Arnd Bergmann
2012-10-07 14:19 ` Olof Johansson
2012-10-07 18:14 ` Tony Prisk
2012-10-07 18:21 ` Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349571734-26233-3-git-send-email-linux@prisktech.co.nz \
--to=linux@prisktech.co.nz \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).