Skip to contentSkip to conversation

Fix regression introduced by a typo in "Tidied other cpu/arm920t/start.S code"

PATCH New Guennadi Liakhovetski 3 participants 3 messages Apr 9, 2008 – Apr 18, 2008

lore
Share & tools
lore

Guennadi Liakhovetski

author
#0 lore raw

PATCH 1/1 Fix regression introduced by a typo in "Tidied other cpu/arm920t/start.S code"

Restore logic reverted by commit

commit 80767a6cead9990d9e77e62be947843c2c72f469

Author: Peter Pearse <[email protected]>
Date:   Wed Sep 5 16:04:41 2007 +0100

Changed API name to coloured_led.h
Removed code using deprecated ifdef CONFIG_BOOTBINFUNC Tidied other cpu/arm920t/start.S code

Signed-off-by Guennadi Liakhovetski <[email protected]>

---

commit 4edc89c17c34c10885082ddbc73b9416e8ff4f5a

Author: Guennadi Liakhovetski <lyakh@6a.(none)>
Date:   Wed Apr 9 17:05:52 2008 +0200

Fix reverted ifdef

Signed-off-by Guennadi Liakhovetski <[email protected]>
cpu/arm920t/start.S +1 -1
index ae86002..acc00ad 100644
@@ -178,7 +178,7 @@ copyex:
 	bl	cpu_init_crit
 #endif
 
-#ifdef	CONFIG_AT91RM9200
+#ifndef	CONFIG_AT91RM9200
 
 #ifndef CONFIG_SKIP_RELOCATE_UBOOT
 relocate:				/* relocate U-Boot to RAM	    */
#1 lore raw

PATCH 1/1 Fix regression introduced by a typo in "Tidied other cpu/arm920t/start.S code"

Quoted 27 lines · Guennadi Liakhovetski

Restore logic reverted by commit

commit 80767a6cead9990d9e77e62be947843c2c72f469

Author: Peter Pearse <[email protected]>
Date:   Wed Sep 5 16:04:41 2007 +0100

Changed API name to coloured_led.h
Removed code using deprecated ifdef CONFIG_BOOTBINFUNC Tidied other cpu/arm920t/start.S code

Signed-off-by Guennadi Liakhovetski <[email protected]>

---

commit 4edc89c17c34c10885082ddbc73b9416e8ff4f5a

Author: Guennadi Liakhovetski <lyakh@6a.(none)>
Date:   Wed Apr 9 17:05:52 2008 +0200

Fix reverted ifdef

Signed-off-by Guennadi Liakhovetski <[email protected]>
cpu/arm920t/start.S +0 -0
index ae86002..acc00ad 100644

cpu/arm920t/start.S copyex: · line 184

Quoted 8 lines
cpu/arm920t/start.S +1 -1
@@ -178,7 +178,7 @@ copyex:
 	bl	cpu_init_crit
 #endif
 
-#ifdef	CONFIG_AT91RM9200
+#ifndef	CONFIG_AT91RM9200
 
 #ifndef CONFIG_SKIP_RELOCATE_UBOOT
 relocate:				/* relocate U-Boot to RAM	    */

we can regroup the ifdef

#if !defined(CONFIG_AT91RM9200) && !defined(CONFIG_SKIP_RELOCATE_UBOOT)

otherwise

Ack-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Best Regards,
J.

Quoted 10 lines

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users

Applied
#2 lore raw

PATCH 1/1 Fix regression introduced by a typo in "Tidied other cpu/arm920t/start.S code"

In reply to Guennadi Liakhovetski

cpu/arm920t/start.S

Quoted 26 lines · In message <[email protected]> you wrote:

Restore logic reverted by commit

commit 80767a6cead9990d9e77e62be947843c2c72f469

Author: Peter Pearse <[email protected]>
Date:   Wed Sep 5 16:04:41 2007 +0100

Changed API name to coloured_led.h
Removed code using deprecated ifdef CONFIG_BOOTBINFUNC Tidied other cpu/arm920t/start.S code

Signed-off-by Guennadi Liakhovetski <[email protected]>

---

commit 4edc89c17c34c10885082ddbc73b9416e8ff4f5a

Author: Guennadi Liakhovetski <lyakh@6a.(none)>
Date:   Wed Apr 9 17:05:52 2008 +0200

Fix reverted ifdef

Signed-off-by Guennadi Liakhovetski <[email protected]>
cpu/arm920t/start.S +0 -0
index ae86002..acc00ad 100644

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
IMPORTANT NOTICE TO PURCHASERS: The Entire Physical Universe,  Inclu-
ding  This Product, May One Day Collapse Back into an Infinitesimally
Small Space. Should  Another  Universe  Subsequently  Re-emerge,  the
Existence of This Product in That Universe Cannot Be Guaranteed.