From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Wed, 19 Mar 2008 18:21:04 +0100
Subject: [U-Boot-Users] [PATCH] [ARM] [RESUBMIT] Move ARM supplied
	dev	boards to new board/arm directory
In-Reply-To: <1205940868.19887.4.camel@us710-oe.cambridge.arm.com>
References: <1205940868.19887.4.camel@us710-oe.cambridge.arm.com>
Message-ID: <20080319172104.GA21588@game.jcrosoft.org>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 15:34 Wed 19 Mar     , Peter Pearse wrote:
> Completely replaces the patch
> [PATCH][ARM] Move ARM supplied dev boards to new board/armltd directory
> submitted Tue, 18 Mar 2008.
> 
> This patch will allow code common to all ARM supplied development boards
> to be shared.
> 
> This patch is also available for test from
>  	@$(MKCONFIG) $(@:_config=) arm arm925t voiceblue
> diff --git a/cpu/arm926ejs/versatile/reset.S b/board/arm/asm.S
> old mode 100644
> new mode 100755
> similarity index 57%
> rename from cpu/arm926ejs/versatile/reset.S
> rename to board/arm/asm.S
> index e898902..aec0d7a
> --- a/cpu/arm926ejs/versatile/reset.S
> +++ b/board/arm/asm.S
> @@ -1,15 +1,7 @@
>  /*
> - *  armboot - Startup Code for ARM926EJS CPU-core
> + *  asm.S - Assembler code common to development boards supplied by ARM
> Ltd.
>   *
> - *  Copyright (c) 2003  Texas Instruments
> - *
> - *  ----- Adapted for OMAP1610 OMAP730 from ARM925t code ------
> - *
> - *  Copyright (c) 2001	Marius Gr?ger <mag@sysgo.de>
> - *  Copyright (c) 2002	Alex Z?pke <azu@sysgo.de>
> - *  Copyright (c) 2002	Gary Jennejohn <gj@denx.de>
> - *  Copyright (c) 2003	Richard Woodruff <r-woodruff2@ti.com>
> - *  Copyright (c) 2003	Kshitij <kshitij@ti.com>
> + *  Copyright (c) 2008 ARM Ltd.
Personaly I'll prefer you do not remove the copyright
>   *
>   * See file CREDITS for list of people who contributed to this
>   * project.
> @@ -30,16 +22,15 @@
>   * MA 02111-1307 USA
>   */
>  
> +/*
> + * Whilst some cores and/or core modules may provide explicit
> + * software reset, these are not used because they may have unwanted
> + * side effects. For U-Boot's purposes calling the reset vector
> suffices.
> + * If necessary, we could set some registers, update the MMU, etc.
> + */
> +
>  	.align	5
>  .globl reset_cpu
>  reset_cpu:
> -	ldr	r1, rstctl1	/* get clkm1 reset ctl */
> -	mov	r3, #0x0
> -	strh	r3, [r1]	/* clear it */
> -	mov	r3, #0x8
> -	strh	r3, [r1]	/* force dsp+arm reset */
> -_loop_forever:
> -	b	_loop_forever
> +	b	0
>  
> -rstctl1:
> -	.word	0xfffece10
> - * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
> - * Alex Zuepke <azu@sysgo.de>
> - *
> - * (C) Copyright 2002-2004
> - * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
> - *
> - * (C) Copyright 2004
> - * Philippe Robin, ARM Ltd. <philippe.robin@arm.com>
> + *  Copyright (c) 2008 ARM Ltd.
Personaly I'll prefer you do not remove the copyright
>   *
>   * See file CREDITS for list of people who contributed to this
>   * project.
> @@ -26,7 +13,7 @@
>   *
>   * This program is distributed in the hope that it will be useful,
>   * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>  static ulong lastdec;

BTW your patch is wrapped by your email client

Best Regards,
J.