Skip to contentSkip to conversation

Unbreak igep0020

PATCH New Michael Lippautz 4 participants 9 messages Sep 3, 2010 – Sep 21, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Unbreak igep0020

These patches should unbreak the igep0020 (igepv2) machine.

* x-load is required since e2b9225af36b2979b255634f79ceecea482601a7.
* u-boot-2009.08 has been unbuildable with recent gcc.

Since I am not the maintainer of the machine/x-load/u-boot, ACKs or comments are needed.

#1 lore raw

PATCH 1/2 x-load/igep0020.conf: Unbreak x-load for igep0020 machine.

* x-load is needed since e2b9225af36b2979b255634f79ceecea482601a7

---
 conf/machine/igep0020.conf                         |    2 ++
 .../x-load-git/igep0020/remove-final-ldflags.patch |   11 +++++++++++
 recipes/x-load/x-load_git.bb                       |    7 ++++++-
 3 files changed, 19 insertions(+), 1 deletions(-)
 create mode 100644 recipes/x-load/x-load-git/igep0020/remove-final-ldflags.patch
conf/machine/igep0020.conf +2 -0
index 55c1850..6295010 100644
@@ -21,6 +21,8 @@ KERNEL_IMAGETYPE = "uImage"
 
 UBOOT_MACHINE = "omap3_igep0020b_config"
 
+XLOAD_MACHINE = "igep0020-flash_config"
+
 IMAGE_FSTYPES += "tar.bz2 ubi"
 
 # Guesswork
recipes/x-load/x-load-git/igep0020/remove-final-ldflags.patch new file +11 -0
new file mode 100644
index 0000000..c5ac09b
@@ -0,0 +1,11 @@
+--- a/Makefile	2010-09-03 09:59:12.000000000 +0200
++++ b/Makefile	2010-09-03 10:43:46.650000018 +0200
+@@ -90,7 +90,7 @@
+  
+ x-load:	$(OBJS) $(LIBS) $(LDSCRIPT)
+ 		UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed  -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
+- 		$(LD) $(LDFLAGS) $$UNDEF_SYM $(OBJS) \
++ 		$(LD) $$UNDEF_SYM $(OBJS) \
+ 			--start-group $(LIBS) --end-group $(PLATFORM_LIBS) \
+ 			-Map x-load.map -o x-load
+  
recipes/x-load/x-load_git.bb +6 -1
index cbcbf17..eb4a2de 100644
@@ -9,7 +9,7 @@ SRCREV_beagleboard = "1c9276af4d6a5b7014a7630a1abeddf3b3177563"
 
 PV = "1.42+${PR}+gitr${SRCREV}"
 PV_beagleboard = "1.44+${PR}+gitr${SRCREV}"
-PR ="r15"
+PR ="r16"
 PE = "1"
 
 SRC_URI = "git://gitorious.org/x-load-omap3/mainline.git;branch=master;protocol=git"
@@ -56,6 +56,11 @@ SRCREV_omapzoom36x = "251d92815500143aefdbe3b3558a0ce6daeaebdc"
 SRC_URI[uboot.md5sum] = "e68b30714d22ce2f926d2dd19f94a2be"
 SRC_URI[uboot.sha256sum] = "e7e5c87d939cc4c1f14d17ea0814b0bed97021c7afca3ef9053c896c2b5bdd6f"
 
+SRC_URI_igep0020 = "git://git.igep.es/pub/scm/x-loader.git;protocol=git \
+                    file://remove-final-ldflags.patch"
+SRCREV_igep0020 = "213d95fcadc54424c796259928d7c15c5a2945a0"
+PV_igep0020 = "1.43+${PR}+gitr${SRCREV}"
+
 S = "${WORKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
Signature · 1 line
1.7.1
#2 lore raw

Re: [PATCH 1/2] x-load/igep0020.conf: Unbreak x-load for igep0020 machine.

Quoted 3 lines · Michael Lippautz

* x-load is needed since e2b9225af36b2979b255634f79ceecea482601a7

looks ok but why is it needed to remove ldflags

Quoted 71 lines

---
 conf/machine/igep0020.conf                         |    2 ++ .../x-load-git/igep0020/remove-final-ldflags.patch |   11 +++++++++++ recipes/x-load/x-load_git.bb                       |    7 ++++++-

 3 files changed, 19 insertions(+), 1 deletions(-)

 create mode 100644 recipes/x-load/x-load-git/igep0020/remove-final-ldflags.patch

conf/machine/igep0020.conf +0 -0
index 55c1850..6295010 100644
@@ -21,6 +21,8 @@ KERNEL_IMAGETYPE = "uImage"
 

 UBOOT_MACHINE = "omap3_igep0020b_config"

conf/machine/igep0020.conf +2 -0
+XLOAD_MACHINE = "igep0020-flash_config"
+

 IMAGE_FSTYPES += "tar.bz2 ubi"

 # Guesswork

recipes/x-load/x-load-git/igep0020/remove-final-ldflags.patch new file +11 -0
new file mode 100644
index 0000000..c5ac09b
@@ -0,0 +1,11 @@
+--- a/Makefile 2010-09-03 09:59:12.000000000 +0200
++++ b/Makefile 2010-09-03 10:43:46.650000018 +0200
+@@ -90,7 +90,7 @@
+
+ x-load:       $(OBJS) $(LIBS) $(LDSCRIPT)
+               UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed  -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
+-              $(LD) $(LDFLAGS) $$UNDEF_SYM $(OBJS) \
++              $(LD) $$UNDEF_SYM $(OBJS) \
+                       --start-group $(LIBS) --end-group $(PLATFORM_LIBS) \
+                       -Map x-load.map -o x-load
+
recipes/x-load/x-load_git.bb +0 -0
index cbcbf17..eb4a2de 100644
@@ -9,7 +9,7 @@ SRCREV_beagleboard = "1c9276af4d6a5b7014a7630a1abeddf3b3177563"
 

 PV = "1.42+${PR}+gitr${SRCREV}"
 PV_beagleboard = "1.44+${PR}+gitr${SRCREV}"

recipes/x-load/x-load_git.bb +1 -1
-PR ="r15"
+PR ="r16"

 PE = "1"

 SRC_URI = "git://gitorious.org/x-load-omap3/mainline.git;branch=master;protocol=git"

recipes/x-load/x-load_git.bb +0 -0
@@ -56,6 +56,11 @@ SRCREV_omapzoom36x = "251d92815500143aefdbe3b3558a0ce6daeaebdc"

 SRC_URI[uboot.md5sum] = "e68b30714d22ce2f926d2dd19f94a2be" SRC_URI[uboot.sha256sum] = "e7e5c87d939cc4c1f14d17ea0814b0bed97021c7afca3ef9053c896c2b5bdd6f"

recipes/x-load/x-load_git.bb +5 -0
+SRC_URI_igep0020 = "git://git.igep.es/pub/scm/x-loader.git;protocol=git \
+                    file://remove-final-ldflags.patch"
+SRCREV_igep0020 = "213d95fcadc54424c796259928d7c15c5a2945a0"
+PV_igep0020 = "1.43+${PR}+gitr${SRCREV}"
+

 S = "${WORKDIR}/git"

 PACKAGE_ARCH = "${MACHINE_ARCH}"
--
1.7.1

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#3 lore raw

Re: [PATCH 1/2] x-load/igep0020.conf: Unbreak x-load for igep0020 machine.

2010/9/3 Khem Raj <[email protected]>:

Quoted 3 lines

looks ok but why is it needed to remove ldflags

LDFLAGS have been wrapped with -Wl,... arguments to allow passing into gcc.

Unfortunatelly ld fails when passing the flags to it. Can I access the raw flags somehow. (ld can produce an link the x-load without LDFLAGS though).

Michael

#4 lore raw

Re: [PATCH 1/2] x-load/igep0020.conf: Unbreak x-load for igep0020 machine.

Bump, as it blocks any igep0020 image from building.

#6 lore raw

PATCH 2/2 u-boot: Unbreak u-boot 2009.08 for gcc >= 4.4

In reply to Michael Lippautz
---
 .../u-boot-2009.08/dont-inline-weak-symbols.patch  |   45 ++++++++++++++++++++
 recipes/u-boot/u-boot_2009.08.bb                   |    5 ++-
 2 files changed, 49 insertions(+), 1 deletions(-)
 create mode 100644 recipes/u-boot/u-boot-2009.08/dont-inline-weak-symbols.patch
recipes/u-boot/u-boot-2009.08/dont-inline-weak-symbols.patch new file +45 -0
new file mode 100644
index 0000000..5931ccf
@@ -0,0 +1,45 @@
+Patch initially created by Ron Lee and archived in OE patchwork at
+http://patchwork.openembedded.org/patch/1534/.
+
+GCC 4.4 complains about this now.
+
+Signed-off-by: Ron Lee <[email protected]>
+---
+ lib_arm/board.c |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+--- a/lib_arm/board.c
++++ b/lib_arm/board.c
+@@ -124,23 +124,23 @@
+  * May be supplied by boards if desired
+  */
+ void inline __coloured_LED_init (void) {}
+-void inline coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
++void coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
+ void inline __red_LED_on (void) {}
+-void inline red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
++void red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
+ void inline __red_LED_off(void) {}
+-void inline red_LED_off(void)	     __attribute__((weak, alias("__red_LED_off")));
++void red_LED_off(void)	     __attribute__((weak, alias("__red_LED_off")));
+ void inline __green_LED_on(void) {}
+-void inline green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
++void green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
+ void inline __green_LED_off(void) {}
+-void inline green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
++void green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
+ void inline __yellow_LED_on(void) {}
+-void inline yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
++void yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
+ void inline __yellow_LED_off(void) {}
+-void inline yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
++void yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
+ void inline __blue_LED_on(void) {}
+-void inline blue_LED_on(void)__attribute__((weak, alias("__blue_LED_on")));
++void blue_LED_on(void)__attribute__((weak, alias("__blue_LED_on")));
+ void inline __blue_LED_off(void) {}
+-void inline blue_LED_off(void)__attribute__((weak, alias("__blue_LED_off")));
++void blue_LED_off(void)__attribute__((weak, alias("__blue_LED_off")));
+ 
+ /************************************************************************
+  * Init Utilities							*
recipes/u-boot/u-boot_2009.08.bb +4 -1
index 506a0cb..868e618 100644
@@ -7,7 +7,10 @@ DEFAULT_PREFERENCE_at91sam9g45ek = "1"
 DEFAULT_PREFERENCE_igep0020 = "1"
 DEFAULT_PREFERENCE_babbage  = "1"
 
-SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 "
+SRC_URI = "\
+    ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
+    file://dont-inline-weak-symbols.patch \
+"
 
 SRC_URI_append_igep0020 = " \
 	file://update-mach-types.patch \
Signature · 1 line
1.7.1
Acked-by on v1 2/2
#7 lore raw

Re: [PATCH 2/2] u-boot: Unbreak u-boot 2009.08 for gcc >= 4.4

Quoted 1 line · Michael Lippautz

seems good.

Quoted 82 lines

---
 .../u-boot-2009.08/dont-inline-weak-symbols.patch  |   45 ++++++++++++++++++++ recipes/u-boot/u-boot_2009.08.bb                   |    5 ++-

 2 files changed, 49 insertions(+), 1 deletions(-)

 create mode 100644 recipes/u-boot/u-boot-2009.08/dont-inline-weak-symbols.patch

recipes/u-boot/u-boot-2009.08/dont-inline-weak-symbols.patch new file +45 -0
new file mode 100644
index 0000000..5931ccf
@@ -0,0 +1,45 @@
+Patch initially created by Ron Lee and archived in OE patchwork at
+http://patchwork.openembedded.org/patch/1534/.
+
+GCC 4.4 complains about this now.
+
+Signed-off-by: Ron Lee <[email protected]>
+---
+ lib_arm/board.c |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+--- a/lib_arm/board.c
++++ b/lib_arm/board.c
+@@ -124,23 +124,23 @@
+  * May be supplied by boards if desired
+  */
+ void inline __coloured_LED_init (void) {}
+-void inline coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
++void coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
+ void inline __red_LED_on (void) {}
+-void inline red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
++void red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
+ void inline __red_LED_off(void) {}
+-void inline red_LED_off(void)      __attribute__((weak, alias("__red_LED_off")));
++void red_LED_off(void)             __attribute__((weak, alias("__red_LED_off")));
+ void inline __green_LED_on(void) {}
+-void inline green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
++void green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
+ void inline __green_LED_off(void) {}
+-void inline green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
++void green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
+ void inline __yellow_LED_on(void) {}
+-void inline yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
++void yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
+ void inline __yellow_LED_off(void) {}
+-void inline yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
++void yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
+ void inline __blue_LED_on(void) {}
+-void inline blue_LED_on(void)__attribute__((weak, alias("__blue_LED_on")));
++void blue_LED_on(void)__attribute__((weak, alias("__blue_LED_on")));
+ void inline __blue_LED_off(void) {}
+-void inline blue_LED_off(void)__attribute__((weak, alias("__blue_LED_off")));
++void blue_LED_off(void)__attribute__((weak, alias("__blue_LED_off")));
+
+ /************************************************************************
+  * Init Utilities                                                     *
recipes/u-boot/u-boot_2009.08.bb +0 -0
index 506a0cb..868e618 100644
@@ -7,7 +7,10 @@ DEFAULT_PREFERENCE_at91sam9g45ek = "1"

 DEFAULT_PREFERENCE_igep0020 = "1"
 DEFAULT_PREFERENCE_babbage  = "1"

recipes/u-boot/u-boot_2009.08.bb +4 -1
-SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 "
+SRC_URI = "\
+    ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
+    file://dont-inline-weak-symbols.patch \
+"

 SRC_URI_append_igep0020 = " \
       file://update-mach-types.patch \
--
1.7.1

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#8 lore raw

Re: [PATCH 2/2] u-boot: Unbreak u-boot 2009.08 for gcc >= 4.4

2010/9/3 Khem Raj <[email protected]>:

Quoted 7 lines
Quoted 1 line · Michael Lippautz

seems good.

This has been discussed in the u-boot mailing list and the patch made it into 2009.11 [1].

[1] http://git.denx.de/?p=u-boot.git;a=blob;f=lib_arm/board.c;h=e148739152c0826130ab70f249c74aa010165d67;hb=a200a7c04d89853d2a1395b96d8ca5e3dd754551

Quoted 89 lines
Quoted 78 lines

---
 .../u-boot-2009.08/dont-inline-weak-symbols.patch  |   45 ++++++++++++++++++++ recipes/u-boot/u-boot_2009.08.bb                   |    5 ++-

 2 files changed, 49 insertions(+), 1 deletions(-)

 create mode 100644 recipes/u-boot/u-boot-2009.08/dont-inline-weak-symbols.patch

recipes/u-boot/u-boot-2009.08/dont-inline-weak-symbols.patch new file +45 -0
new file mode 100644
index 0000000..5931ccf
@@ -0,0 +1,45 @@
+Patch initially created by Ron Lee and archived in OE patchwork at
+http://patchwork.openembedded.org/patch/1534/.
+
+GCC 4.4 complains about this now.
+
+Signed-off-by: Ron Lee <[email protected]>
+---
+ lib_arm/board.c |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+--- a/lib_arm/board.c
++++ b/lib_arm/board.c
+@@ -124,23 +124,23 @@
+  * May be supplied by boards if desired
+  */
+ void inline __coloured_LED_init (void) {}
+-void inline coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
++void coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init")));
+ void inline __red_LED_on (void) {}
+-void inline red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
++void red_LED_on (void) __attribute__((weak, alias("__red_LED_on")));
+ void inline __red_LED_off(void) {}
+-void inline red_LED_off(void)      __attribute__((weak, alias("__red_LED_off")));
++void red_LED_off(void)             __attribute__((weak, alias("__red_LED_off")));
+ void inline __green_LED_on(void) {}
+-void inline green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
++void green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
+ void inline __green_LED_off(void) {}
+-void inline green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
++void green_LED_off(void)__attribute__((weak, alias("__green_LED_off")));
+ void inline __yellow_LED_on(void) {}
+-void inline yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
++void yellow_LED_on(void)__attribute__((weak, alias("__yellow_LED_on")));
+ void inline __yellow_LED_off(void) {}
+-void inline yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
++void yellow_LED_off(void)__attribute__((weak, alias("__yellow_LED_off")));
+ void inline __blue_LED_on(void) {}
+-void inline blue_LED_on(void)__attribute__((weak, alias("__blue_LED_on")));
++void blue_LED_on(void)__attribute__((weak, alias("__blue_LED_on")));
+ void inline __blue_LED_off(void) {}
+-void inline blue_LED_off(void)__attribute__((weak, alias("__blue_LED_off")));
++void blue_LED_off(void)__attribute__((weak, alias("__blue_LED_off")));
+
+ /************************************************************************
+  * Init Utilities                                                     *
recipes/u-boot/u-boot_2009.08.bb +0 -0
index 506a0cb..868e618 100644
@@ -7,7 +7,10 @@ DEFAULT_PREFERENCE_at91sam9g45ek = "1"

 DEFAULT_PREFERENCE_igep0020 = "1"
 DEFAULT_PREFERENCE_babbage  = "1"

recipes/u-boot/u-boot_2009.08.bb +4 -1
-SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 "
+SRC_URI = "\
+    ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \
+    file://dont-inline-weak-symbols.patch \
+"

 SRC_URI_append_igep0020 = " \
       file://update-mach-types.patch \
--
1.7.1

Quoted 5 lines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel