public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Allen Martin <amartin@nvidia.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 07/13] ARM: Fix arm720t SPL build
Date: Thu, 21 Jun 2012 17:00:41 -0700	[thread overview]
Message-ID: <1340323247-15512-8-git-send-email-amartin@nvidia.com> (raw)
In-Reply-To: <1340323247-15512-1-git-send-email-amartin@nvidia.com>

Take a few SPL fixes from armv7 and apply them to arm720t:
-Use dummy exception handlers for SPL build
-Initialize relocation register r9 to 0 for the case of no relocation
-ifdef out interrupt handler code

Signed-off-by: Allen Martin <amartin@nvidia.com>
---
 arch/arm/cpu/arm720t/start.S |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S
index 540e3c2..df66946 100644
--- a/arch/arm/cpu/arm720t/start.S
+++ b/arch/arm/cpu/arm720t/start.S
@@ -51,6 +51,15 @@ _start: b	reset
 	ldr	pc, _irq
 	ldr	pc, _fiq
 
+#ifdef CONFIG_SPL_BUILD
+_undefined_instruction: .word _undefined_instruction
+_software_interrupt:	.word _software_interrupt
+_prefetch_abort:	.word _prefetch_abort
+_data_abort:		.word _data_abort
+_not_used:		.word _not_used
+_irq:			.word _irq
+_fiq:			.word _fiq
+#else
 _undefined_instruction: .word undefined_instruction
 _software_interrupt:	.word software_interrupt
 _prefetch_abort:	.word prefetch_abort
@@ -58,6 +67,7 @@ _data_abort:		.word data_abort
 _not_used:		.word not_used
 _irq:			.word irq
 _fiq:			.word fiq
+#endif	/* CONFIG_SPL_BUILD */
 
 	.balignl 16,0xdeadbeef
 
@@ -167,6 +177,7 @@ stack_setup:
 
 	adr	r0, _start
 	cmp	r0, r6
+	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
 	beq	clear_bss		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _bss_start_ofs
@@ -425,6 +436,7 @@ lock_loop:
 	mov	pc, lr
 
 
+#ifndef CONFIG_SPL_BUILD
 /*
  *************************************************************************
  *
@@ -587,6 +599,7 @@ fiq:
 	bl	do_fiq
 
 #endif
+#endif /* CONFIG_SPL_BUILD */
 
 #if defined(CONFIG_NETARM)
 	.align	5
-- 
1.7.9.5

  parent reply	other threads:[~2012-06-22  0:00 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-22  0:00 [U-Boot] [PATCH v4 0/13] split tegra20 arm7 code into separate SPL Allen Martin
2012-06-22  0:00 ` [U-Boot] [PATCH v4 01/13] tegra20: rename tegra2 -> tegra20 Allen Martin
2012-06-22 18:13   ` Stephen Warren
2012-06-22 18:41     ` Allen Martin
2012-06-22  0:00 ` [U-Boot] [PATCH v4 02/13] tegra20: move tegra20 SoC code to arch/arm/cpu/tegra20-common Allen Martin
2012-06-22 18:15   ` Stephen Warren
2012-06-22 18:43     ` Allen Martin
2012-06-22  0:00 ` [U-Boot] [PATCH v4 03/13] tegra20: rename CONFIG_MACH_TEGRA_GENERIC Allen Martin
2012-06-22  0:00 ` [U-Boot] [PATCH v4 04/13] tegra20: tec: add tegra20-common-post.h Allen Martin
2012-06-22  0:00 ` [U-Boot] [PATCH v4 05/13] tegra20: plutux: change obj directory mkdir commands Allen Martin
2012-06-25 17:39   ` Allen Martin
2012-06-22  0:00 ` [U-Boot] [PATCH v4 06/13] mkconfig: add support for SPL CPU Allen Martin
2012-06-22  0:00 ` Allen Martin [this message]
2012-06-22  0:00 ` [U-Boot] [PATCH v4 08/13] tegra20: remove timer_init from SPL build Allen Martin
2012-06-22  0:00 ` [U-Boot] [PATCH v4 09/13] ARM: add tegra20 support to arm720t Allen Martin
2012-06-22  0:00 ` [U-Boot] [PATCH v4 10/13] tegra20: add u-boot-t2.bin target Allen Martin
2012-06-22  0:00 ` [U-Boot] [PATCH v4 11/13] tegra20: move SDRAM param save to later in boot Allen Martin
2012-06-22  0:00 ` [U-Boot] [PATCH v4 12/13] tegra20: enable SPL for tegra20 boards Allen Martin
2012-06-22  0:00 ` [U-Boot] [PATCH v4 13/13] tegra20: Remove armv4t build flags Allen Martin
2012-06-22 18:27   ` Stephen Warren

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=1340323247-15512-8-git-send-email-amartin@nvidia.com \
    --to=amartin@nvidia.com \
    --cc=u-boot@lists.denx.de \
    /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