[oe-commits] org.oe.dev Fix to allow uboot to build with newer make (i.e 3.81)

[ifaistos commit]

Fix to allow uboot to build with newer make (i.e 3.81)

Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: 361379aa261c9847d4ff3ffcf77bb2fa90c4b6bf
ViewMTN: http://monotone.openembedded.org/revision.psp?id=361379aa261c9847d4ff3ffcf77bb2fa90c4b6bf
Files:
1
packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch
packages/uboot/u-boot_1.1.4.bb
Diffs:

#
# mt diff -r3f4b040c23a7e90bc0056cd764c234d38a87df09 -r361379aa261c9847d4ff3ffcf77bb2fa90c4b6bf
#
# 
# 
# add_file "packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch"
#  content [42acdf031249fca4252c576028c1f759c3959084]
# 
# patch "packages/uboot/u-boot_1.1.4.bb"
#  from [ed460f1e61f0a96db2c3d36fc9672273fd66a0fa]
#    to [6995f3d3823f0f9c62934e27d358031b5a2b8312]
# 
============================================================
--- packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch	42acdf031249fca4252c576028c1f759c3959084
+++ packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch	42acdf031249fca4252c576028c1f759c3959084
@@ -0,0 +1,15 @@
+--- /examples/orig-Makefile	2005-12-16 18:39:27.000000000 +0200
++++ /examples/Makefile	2006-12-02 14:58:59.000000000 +0200
+@@ -123,10 +123,10 @@
+ 	$(LD) -g $(EX_LDFLAGS) -Ttext $(LOAD_ADDR) \
+ 		-o $@ -e $(<:.o=) $< $(LIB) \
+ 		-L$(gcclibdir) -lgcc
+-%.srec:	%
++%.srec:	%.o
+ 	$(OBJCOPY) -O srec $< $@ 2>/dev/null
+ 
+-%.bin:	%
++%.bin:	%.o
+ 	$(OBJCOPY) -O binary $< $@ 2>/dev/null
+ 
+ #########################################################################
============================================================
--- packages/uboot/u-boot_1.1.4.bb	ed460f1e61f0a96db2c3d36fc9672273fd66a0fa
+++ packages/uboot/u-boot_1.1.4.bb	6995f3d3823f0f9c62934e27d358031b5a2b8312
@@ -6,7 +6,9 @@ DEFAULT_PREFERENCE = "-1"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+          file://u-boot-make381-fix.patch;patch=1"
+
 SRC_URI_append_gumstix = "\
 						  file://u-boot-autoscript.patch;patch=1 \
 						  file://u-boot-base.patch;patch=1 \
@@ -24,6 +26,10 @@ SRC_URI_append_amsdelta = "\
 SRC_URI_append_amsdelta = "\
 	http://the.earth.li/pub/e3/u-boot-amsdelta-20060519.diff;patch=1"
 
+SRC_URI_append_dht-walnut= "\ 
+        file://u-boot-dht-walnut-df2.patch;patch=1"
+
+
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 EXTRA_OEMAKE_gumstix = "CROSS_COMPILE=${TARGET_PREFIX} GUMSTIX_400MHZ=${GUMSTIX_400MHZ}"
 TARGET_LDFLAGS = ""
@@ -31,6 +37,8 @@ UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-$
 UBOOT_MACHINE ?= "${MACHINE}_config"
 UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin"
 
+UBOOT_MACHINE_dht-walnut = "walnut_config"
+
 def gumstix_mhz(d):
 	import bb
         m = bb.data.getVar('GUMSTIX_400MHZ', d, 1)