leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix @ -> <at> substitution

Browse Source 
When applying the AT91CAP9 patches upstream, something transformed
the '@' character into the ' <at> ' sequence.

The patch below restores the original form in all the places where
it has been modified (the AT91CAP9 files, the AT91SAM9260 files which
were copied from AT91CAP9, and a couple of other files where the
' <at> ' sequence was present).

Signed-off-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Stelian Pop 2008-05-08 22:52:09 +02:00 committed by Jean-Christophe PLAGNIOL-VILLARD
parent 908261f3fd
commit 567fb85217
22 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG
View File

@ -6477,7 +6477,7 @@ Date: Mon Mar 3 11:57:23 2008 +0000
Originally pointed out by Laurent Pinchart <laurent.pinchart@tbox.biz>, Originally pointed out by Laurent Pinchart <laurent.pinchart@tbox.biz>,
see http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/22846 see http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/22846
Signed-off-by: Bernhard Nemec <bnemec <at> ganssloser.com> Signed-off-by: Bernhard Nemec <bnemec@ganssloser.com>
commit 84d0c2f1e39caff58bf765a7ab7c72da23c25ec8 commit 84d0c2f1e39caff58bf765a7ab7c72da23c25ec8
Author: Kim B. Heino <Kim.Heino@bluegiga.com> Author: Kim B. Heino <Kim.Heino@bluegiga.com>
@ -7707,7 +7707,7 @@ Date: Mon Feb 18 14:01:56 2008 -0600
86xx: Convert sbc8641d to use libfdt. 86xx: Convert sbc8641d to use libfdt.
This is the proper fix for a missing closing brace in the function This is the proper fix for a missing closing brace in the function
ft_cpu_setup() noticed by joe.hamman <at> embeddedspecialties.com. ft_cpu_setup() noticed by joe.hamman@embeddedspecialties.com.
The ft_cpu_setup() function in mpc8641hpcn.c should have been The ft_cpu_setup() function in mpc8641hpcn.c should have been
removed earlier as it was under the obsolete CONFIG_OF_FLAT_TREE, removed earlier as it was under the obsolete CONFIG_OF_FLAT_TREE,
but was missed. Only, the sbc8641d was nominally still using it. but was missed. Only, the sbc8641d was nominally still using it.
@ -8102,7 +8102,7 @@ Date: Fri Feb 22 11:40:50 2008 +0000
We already have a vendor subdir for Atmel, so we should use it. We already have a vendor subdir for Atmel, so we should use it.
Signed-off-by: Haavard Skinnemoen <hskinnemoen <at> atmel.com> Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
commit 6d0943a6be99977d6d853d51749e9963d68eb192 commit 6d0943a6be99977d6d853d51749e9963d68eb192
Author: Andreas Engel <andreas.engel@ericsson.com> Author: Andreas Engel <andreas.engel@ericsson.com>
@ -8152,8 +8152,8 @@ Date: Thu Jan 3 21:15:56 2008 +0000
AT91CAP9 support : MACB changes AT91CAP9 support : MACB changes
Signed-off-by: Stelian Pop <stelian <at> popies.net> Signed-off-by: Stelian Pop <stelian@popies.net>
Acked-by: Haavard Skinnemoen <hskinnemoen <at> atmel.com> Acked-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
commit 6afcabf11d7321850f4feaadfee841488ace54c5 commit 6afcabf11d7321850f4feaadfee841488ace54c5
Author: Stelian Pop <stelian@popies.net> Author: Stelian Pop <stelian@popies.net>
@ -8169,7 +8169,7 @@ Date: Wed Jan 30 21:15:54 2008 +0000
AT91CAP9 support : cpu/ files AT91CAP9 support : cpu/ files
Signed-off-by: Stelian Pop <stelian <at> popies.net> Signed-off-by: Stelian Pop <stelian@popies.net>
commit fa506a926cec348805143576c941f8e61b333cc0 commit fa506a926cec348805143576c941f8e61b333cc0
Author: Stelian Pop <stelian@popies.net> Author: Stelian Pop <stelian@popies.net>

2
board/atmel/at91cap9adk/Makefile
View File

@ -1,6 +1,6 @@
# #
# (C) Copyright 2003-2008 # (C) Copyright 2003-2008
# Wolfgang Denk, DENX Software Engineering, wd <at> denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# See file CREDITS for list of people who contributed to this # See file CREDITS for list of people who contributed to this
# project. # project.

2
board/atmel/at91cap9adk/at91cap9adk.c
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2007-2008 * (C) Copyright 2007-2008
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this

2
board/atmel/at91cap9adk/led.c
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2007-2008 * (C) Copyright 2007-2008
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this

2
board/atmel/at91cap9adk/nand.c
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2007-2008 * (C) Copyright 2007-2008
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* (C) Copyright 2006 ATMEL Rousset, Lacressonniere Nicolas * (C) Copyright 2006 ATMEL Rousset, Lacressonniere Nicolas

2
board/atmel/at91cap9adk/u-boot.lds
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2002 * (C) Copyright 2002
* Gary Jennejohn, DENX Software Engineering, <gj <at> denx.de> * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.

2
board/atmel/at91sam9260ek/Makefile
View File

@ -1,6 +1,6 @@
# #
# (C) Copyright 2003-2008 # (C) Copyright 2003-2008
# Wolfgang Denk, DENX Software Engineering, wd <at> denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# See file CREDITS for list of people who contributed to this # See file CREDITS for list of people who contributed to this
# project. # project.

2
board/atmel/at91sam9260ek/at91sam9260ek.c
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2007-2008 * (C) Copyright 2007-2008
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this

2
board/atmel/at91sam9260ek/led.c
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2007-2008 * (C) Copyright 2007-2008
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this

2
board/atmel/at91sam9260ek/nand.c
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2007-2008 * (C) Copyright 2007-2008
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* (C) Copyright 2006 ATMEL Rousset, Lacressonniere Nicolas * (C) Copyright 2006 ATMEL Rousset, Lacressonniere Nicolas

2
board/atmel/at91sam9260ek/u-boot.lds
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2002 * (C) Copyright 2002
* Gary Jennejohn, DENX Software Engineering, <gj <at> denx.de> * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.

2
cpu/arm926ejs/at91sam9/Makefile
View File

@ -1,6 +1,6 @@
# #
# (C) Copyright 2000-2008 # (C) Copyright 2000-2008
# Wolfgang Denk, DENX Software Engineering, wd <at> denx.de. # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# See file CREDITS for list of people who contributed to this # See file CREDITS for list of people who contributed to this
# project. # project.

2
cpu/arm926ejs/at91sam9/ether.c
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2007-2008 * (C) Copyright 2007-2008
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this

2
cpu/arm926ejs/at91sam9/lowlevel_init.S
View File

@ -2,7 +2,7 @@
* AT91CAP9/SAM9 setup stuff * AT91CAP9/SAM9 setup stuff
* *
* (C) Copyright 2007-2008 * (C) Copyright 2007-2008
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this

2
cpu/arm926ejs/at91sam9/timer.c
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2007-2008 * (C) Copyright 2007-2008
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this

2
cpu/arm926ejs/at91sam9/usb.c
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2006 * (C) Copyright 2006
* DENX Software Engineering <mk <at> denx.de> * DENX Software Engineering <mk@denx.de>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.

2
drivers/net/smc911x.c
View File

@ -1,7 +1,7 @@
/* /*
* SMSC LAN9[12]1[567] Network driver * SMSC LAN9[12]1[567] Network driver
* *
* (c) 2007 Pengutronix, Sascha Hauer <s.hauer <at> pengutronix.de> * (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.

2
include/asm-arm/arch-at91sam9/clk.h
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2007 * (C) Copyright 2007
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this

2
include/asm-arm/arch-at91sam9/memory-map.h
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2007-2008 * (C) Copyright 2007-2008
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this

2
include/asm-arm/dma-mapping.h
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2007 * (C) Copyright 2007
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this

2
include/configs/at91cap9adk.h
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2007-2008 * (C) Copyright 2007-2008
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* Configuation settings for the AT91CAP9ADK board. * Configuation settings for the AT91CAP9ADK board.

2
include/configs/at91sam9260ek.h
View File

@ -1,6 +1,6 @@
/* /*
* (C) Copyright 2007-2008 * (C) Copyright 2007-2008
* Stelian Pop <stelian.pop <at> leadtechdesign.com> * Stelian Pop <stelian.pop@leadtechdesign.com>
* Lead Tech Design <www.leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com>
* *
* Configuation settings for the AT91SAM9260EK board. * Configuation settings for the AT91SAM9260EK board.