[U-Boot-Users] [PATCH] [ARM] [RESUBMIT] Move ARM supplied dev boards to new board/arm directory

[Peter Pearse]

> -----Original Message-----
> From: wd at denx.de [mailto:wd at denx.de] 
> Sent: 19 March 2008 20:16
> To: Jean-Christophe PLAGNIOL-VILLARD
> Cc: Peter Pearse; U-Boot-Users
> Subject: Re: [U-Boot-Users] [PATCH] [ARM] [RESUBMIT] Move ARM 
> supplied dev boards to new board/arm directory
> 
> In message <20080319172104.GA21588 at game.jcrosoft.org> you wrote:
> >
> > >  /*
> > > - *  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=F6ger <mag at sysgo.de>
> > > - *  Copyright (c) 2002	Alex Z=FCpke <azu at sysgo.de>
> > > - *  Copyright (c) 2002	Gary Jennejohn <gj at denx.de>
> > > - *  Copyright (c) 2003	Richard Woodruff <r-woodruff2 at ti.com>
> > > - *  Copyright (c) 2003	Kshitij <kshitij at ti.com>
> > > + *  Copyright (c) 2008 ARM Ltd.
> > Personaly I'll prefer you do not remove the copyright
> 
> This is not a matter of preferences.
> 
> Removing copyright entries is a strict TABU.
> 
> Never, never ever do that!
> 
> 
> Best regards,
> 
> Wolfgang Denk

I wouldn't remove copyright intentionally.

Here git -M has decided that a new file 

board/arm/arm.S 

is actually a modified old file

cpu/arm926ejs/versatile/reset.S

Since the new file contained different code, 
I removed the old copyright lines and added a new one.

Perhaps a git guru can suggest how I avoid this in future,
other than inspecting every patch and modifying by hand.

(Although I'll do that if necessary)
----------------
reset.S code:

	.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

rstctl1:
	.word	0xfffece10
----------------
board/arm/asm.S

	.align	5
.globl reset_cpu
reset_cpu:
	b	0
----------------

Regards

Peter