[oe-commits] org.oe.dev uboot-gta01:

mickeyl commit openembedded-commits at lists.openembedded.org
Fri Jun 22 04:34:59 UTC 2007


uboot-gta01:
* remove outdated patches
* remove tools build
* add (hackish) fix for eabi situation

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 72828db522ed0ce680c314feb29f7360c90a2e88
ViewMTN: http://monotone.openembedded.org/revision.psp?id=72828db522ed0ce680c314feb29f7360c90a2e88
Files:
1
packages/uboot/files/gta01_nand.h
packages/uboot/files/qt2410.h
packages/uboot/files/qt2410_nand.h
packages/uboot/files/qt2410_ram.h
packages/uboot/files/u-boot-20060807-qt2410.patch
packages/uboot/files/u-boot-20060907-gta01.patch
packages/uboot/files/u-boot-20061030-gta01bv2.patch
packages/uboot/files/u-boot-20061030-gta01v4.patch
packages/uboot/files/u-boot-20061030-qt2410-gta01.patch
packages/uboot/u-boot-mkimage-gta01-native
packages/uboot/u-boot-mkimage-gta01-native/bbt-create-optional.patch
packages/uboot/u-boot-mkimage-gta01-native/bbt-scan-second.patch
packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-and-nand.patch
packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-reloc.patch
packages/uboot/u-boot-mkimage-gta01-native/boot-menu.patch
packages/uboot/u-boot-mkimage-gta01-native/cmd-unzip.patch
packages/uboot/u-boot-mkimage-gta01-native/console-ansi.patch
packages/uboot/u-boot-mkimage-gta01-native/default-env.patch
packages/uboot/u-boot-mkimage-gta01-native/dontask.patch
packages/uboot/u-boot-mkimage-gta01-native/dynenv-harden.patch
packages/uboot/u-boot-mkimage-gta01-native/early-powerdown.patch
packages/uboot/u-boot-mkimage-gta01-native/enable-splash-bmp.patch
packages/uboot/u-boot-mkimage-gta01-native/env_nand_oob.patch
packages/uboot/u-boot-mkimage-gta01-native/ext2load_hex.patch
packages/uboot/u-boot-mkimage-gta01-native/lowlevel_foo.patch
packages/uboot/u-boot-mkimage-gta01-native/mmcinit-power-up.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-badisbad.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-createbbt.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-dynamic_partitions.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-otp.patch
packages/uboot/u-boot-mkimage-gta01-native/nand-read_write_oob.patch
packages/uboot/u-boot-mkimage-gta01-native/neo1973-chargefast.patch
packages/uboot/u-boot-mkimage-gta01-native/preboot-override.patch
packages/uboot/u-boot-mkimage-gta01-native/raise-limits.patch
packages/uboot/u-boot-mkimage-gta01-native/series
packages/uboot/u-boot-mkimage-gta01-native/splashimage-command.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-neo1973.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-qt2410.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920_s3c2410_irq_demux.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920t-gd_in_irq.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-bbt-quiet.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-cmd_s3c2410.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-cramfs_but_no_jffs2.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-dfu.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-gta02.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-hxd8.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-license.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-machtypes.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-mokoversion.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-nand-markbad-reallybad.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-resume.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-misccr-definitions.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-mmc.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-nand.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-norelocate_irqvec_cpy.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-warnings-fix.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_fb.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_udc.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2440.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2443.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2440.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2443.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-strtoul.patch
packages/uboot/u-boot-mkimage-gta01-native/uboot-usbtty-acm.patch
packages/uboot/u-boot-mkimage-gta01-native/unbusy-i2c.patch
packages/uboot/u-boot-mkimage-gta01-native/usbdcore-multiple_configs.patch
packages/uboot/u-boot-mkimage-gta01-native/wakeup-reason-nand-only.patch
packages/uboot/u-boot-mkimage-gta01-native_oe.bb
packages/uboot/u-boot-mkimage-gta01-native_svn.bb
packages/uboot/uboot-qt2410_0.0+cvs20061030.bb
packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch
packages/uboot/files/uboot-eabi-fix-HACK.patch
packages/uboot/uboot-gta01_svn.bb
Diffs:

#
# mt diff -r6751c33f46b4e65f3b35180979c5046f64ffb938 -r72828db522ed0ce680c314feb29f7360c90a2e88
#
# 
# 
# delete "packages/uboot/files/gta01_nand.h"
# 
# delete "packages/uboot/files/qt2410.h"
# 
# delete "packages/uboot/files/qt2410_nand.h"
# 
# delete "packages/uboot/files/qt2410_ram.h"
# 
# delete "packages/uboot/files/u-boot-20060807-qt2410.patch"
# 
# delete "packages/uboot/files/u-boot-20060907-gta01.patch"
# 
# delete "packages/uboot/files/u-boot-20061030-gta01bv2.patch"
# 
# delete "packages/uboot/files/u-boot-20061030-gta01v4.patch"
# 
# delete "packages/uboot/files/u-boot-20061030-qt2410-gta01.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/bbt-create-optional.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/bbt-scan-second.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-and-nand.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/boot-from-ram-reloc.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/boot-menu.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/cmd-unzip.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/console-ansi.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/default-env.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/dontask.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/dynenv-harden.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/early-powerdown.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/enable-splash-bmp.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/env_nand_oob.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/ext2load_hex.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/lowlevel_foo.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/mmcinit-power-up.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-badisbad.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-createbbt.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-dynamic_partitions.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-otp.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/nand-read_write_oob.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/neo1973-chargefast.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/preboot-override.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/raise-limits.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/series"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/splashimage-command.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-neo1973.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-20061030-qt2410.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920_s3c2410_irq_demux.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-arm920t-gd_in_irq.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-bbt-quiet.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-cmd_s3c2410.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-cramfs_but_no_jffs2.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-dfu.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-gta02.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-hxd8.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-license.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-machtypes.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-mokoversion.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-nand-markbad-reallybad.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-defaultenv.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-neo1973-resume.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-misccr-definitions.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-mmc.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-nand.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-norelocate_irqvec_cpy.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410-warnings-fix.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_fb.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2410_udc.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2440.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-s3c2443.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2440.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-smdk2443.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-strtoul.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/uboot-usbtty-acm.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/unbusy-i2c.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/usbdcore-multiple_configs.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native/wakeup-reason-nand-only.patch"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native_oe.bb"
# 
# delete "packages/uboot/u-boot-mkimage-gta01-native_svn.bb"
# 
# delete "packages/uboot/uboot-qt2410_0.0+cvs20061030.bb"
# 
# add_file "packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch"
#  content [575298514df1fc14f35e686d68f10eb0e1584978]
# 
# add_file "packages/uboot/files/uboot-eabi-fix-HACK.patch"
#  content [048fdee069aa7a28b634f89c0e5ffcf480c174a1]
# 
# patch "packages/uboot/uboot-gta01_svn.bb"
#  from [99839c5d6e1423ba68d992f0dfc835c2927b72c6]
#    to [62211a5a9b706926a1f230401f042f8add732e37]
# 
============================================================
--- packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch	575298514df1fc14f35e686d68f10eb0e1584978
+++ packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch	575298514df1fc14f35e686d68f10eb0e1584978
@@ -0,0 +1,19 @@
+--- a/tools/Makefile	2007-03-11 00:55:44.000000000 +0000
++++ b/tools/Makefile	2007-03-11 00:55:52.000000000 +0000
+@@ -194,14 +194,14 @@
+ 
+ $(obj)environment.c:
+ 		@rm -f $(obj)environment.c
+-		ln -s $(src)../common/environment.c $(obj)environment.c
++		ln -sf $(src)../common/environment.c $(obj)environment.c
+ 
+ $(obj)environment.o:	$(obj)environment.c
+ 		$(CC) -g $(HOST_ENVIRO_CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ 
+ $(obj)crc32.c:
+ 		@rm -f $(obj)crc32.c
+-		ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c
++		ln -sf $(src)../lib_generic/crc32.c $(obj)crc32.c
+ 
+ $(LOGO_H):	$(obj)bmp_logo $(LOGO_BMP)
+ 		$(obj)./bmp_logo $(LOGO_BMP) >$@
============================================================
--- packages/uboot/files/uboot-eabi-fix-HACK.patch	048fdee069aa7a28b634f89c0e5ffcf480c174a1
+++ packages/uboot/files/uboot-eabi-fix-HACK.patch	048fdee069aa7a28b634f89c0e5ffcf480c174a1
@@ -0,0 +1,197 @@
+Index: git/lib_arm/div0.c
+===================================================================
+--- git.orig/lib_arm/div0.c
++++ git/lib_arm/div0.c
+@@ -22,9 +22,3 @@
+  */
+ 
+ /* Replacement (=dummy) for GNU/Linux division-by zero handler */
+-void __div0 (void)
+-{
+-	extern void hang (void);
+-
+-	hang();
+-}
+Index: git/board/neo1973/common/bootmenu.c
+===================================================================
+--- git.orig/board/neo1973/common/bootmenu.c
++++ git/board/neo1973/common/bootmenu.c
+@@ -118,3 +118,14 @@ void neo1973_bootmenu(void)
+ 	bootmenu_add("Factory reset", factory_reset, NULL);
+ 	bootmenu();
+ }
++
++void raise()
++{
++    serial_printf( "*** something's wrong... please reset ***\n" );
++}
++
++void abort()
++{
++    serial_printf( "*** something's wrong... please reset ***\n" );
++}
++
+Index: git/board/neo1973/gta01/u-boot.lds
+===================================================================
+--- git.orig/board/neo1973/gta01/u-boot.lds
++++ git/board/neo1973/gta01/u-boot.lds
+@@ -39,6 +39,10 @@ SECTIONS
+ 
+ 	. = ALIGN(4);
+ 	.rodata : { *(.rodata) }
++	.ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
++	__exidx_start = .;
++	.ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
++	__exidx_end = .;
+ 
+ 	. = ALIGN(4);
+ 	.data : { *(.data) }
+Index: git/board/neo1973/gta02/u-boot.lds
+===================================================================
+--- git.orig/board/neo1973/gta02/u-boot.lds
++++ git/board/neo1973/gta02/u-boot.lds
+@@ -39,6 +39,10 @@ SECTIONS
+ 
+ 	. = ALIGN(4);
+ 	.rodata : { *(.rodata) }
++	.ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
++	__exidx_start = .;
++	.ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
++	__exidx_end = .;
+ 
+ 	. = ALIGN(4);
+ 	.data : { *(.data) }
+Index: git/board/neo1973/common/lowlevel_foo.lds
+===================================================================
+--- git.orig/board/neo1973/common/lowlevel_foo.lds
++++ git/board/neo1973/common/lowlevel_foo.lds
+@@ -37,6 +37,10 @@ SECTIONS
+ 
+ 	. = ALIGN(4);
+ 	.rodata : { *(.rodata) }
++	.ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
++	__exidx_start = .;
++	.ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
++	__exidx_end = .;
+ 
+ 	. = ALIGN(4);
+ 	.data : { *(.data) }
+Index: git/board/hxd8/hxd8.c
+===================================================================
+--- git.orig/board/hxd8/hxd8.c
++++ git/board/hxd8/hxd8.c
+@@ -187,3 +187,6 @@ unsigned int dynpart_size[] = {
+ char *dynpart_names[] = {
+     "u-boot", "u-boot_env", "kernel", "splash", "rootfs", NULL };
+ 
++void raise() {}
++
++void abort() {}
+Index: git/board/hxd8/u-boot.lds
+===================================================================
+--- git.orig/board/hxd8/u-boot.lds
++++ git/board/hxd8/u-boot.lds
+@@ -39,6 +39,10 @@ SECTIONS
+ 
+ 	. = ALIGN(4);
+ 	.rodata : { *(.rodata) }
++	.ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
++	__exidx_start = .;
++	.ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
++	__exidx_end = .;
+ 
+ 	. = ALIGN(4);
+ 	.data : { *(.data) }
+Index: git/board/hxd8/lowlevel_foo.lds
+===================================================================
+--- git.orig/board/hxd8/lowlevel_foo.lds
++++ git/board/hxd8/lowlevel_foo.lds
+@@ -37,6 +37,10 @@ SECTIONS
+ 
+ 	. = ALIGN(4);
+ 	.rodata : { *(.rodata) }
++	.ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
++	__exidx_start = .;
++	.ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
++	__exidx_end = .;
+ 
+ 	. = ALIGN(4);
+ 	.data : { *(.data) }
+Index: git/board/qt2410/qt2410.c
+===================================================================
+--- git.orig/board/qt2410/qt2410.c
++++ git/board/qt2410/qt2410.c
+@@ -156,3 +156,7 @@ unsigned int dynpart_size[] = {
+ char *dynpart_names[] = {
+     "u-boot", "u-boot_env", "kernel", "splash", "rootfs", NULL };
+ 
++void raise() {}
++
++void abort() {}
++
+Index: git/board/qt2410/u-boot.lds
+===================================================================
+--- git.orig/board/qt2410/u-boot.lds
++++ git/board/qt2410/u-boot.lds
+@@ -39,6 +39,10 @@ SECTIONS
+ 
+ 	. = ALIGN(4);
+ 	.rodata : { *(.rodata) }
++	.ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
++	__exidx_start = .;
++	.ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
++	__exidx_end = .;
+ 
+ 	. = ALIGN(4);
+ 	.data : { *(.data) }
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile
++++ git/Makefile
+@@ -225,7 +225,7 @@ LIBS := $(addprefix $(obj),$(LIBS))
+ .PHONY : $(LIBS)
+ 
+ # Add GCC lib
+-PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
++PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc -lgcc_eh
+ 
+ # The "tools" are needed early, so put this first
+ # Don't include stuff already done in $(LIBS)
+Index: git/board/smdk2440/smdk2440.c
+===================================================================
+--- git.orig/board/smdk2440/smdk2440.c
++++ git/board/smdk2440/smdk2440.c
+@@ -150,3 +150,6 @@ char *dynpart_names[] = {
+     "u-boot", "u-boot_env", "kernel", "splash", "rootfs", NULL };
+ 
+ 
++void raise() {}
++void abort() {}
++
+Index: git/board/smdk2440/u-boot.lds
+===================================================================
+--- git.orig/board/smdk2440/u-boot.lds
++++ git/board/smdk2440/u-boot.lds
+@@ -39,6 +39,10 @@ SECTIONS
+ 
+ 	. = ALIGN(4);
+ 	.rodata : { *(.rodata) }
++	.ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) }
++	__exidx_start = .;
++	.ARM.exidx   : { *(.ARM.exidx* .gnu.linkonce.armexidx.*) }
++	__exidx_end = .;
+ 
+ 	. = ALIGN(4);
+ 	.data : { *(.data) }
+Index: git/board/neo1973/gta02/gta02.c
+===================================================================
+--- git.orig/board/neo1973/gta02/gta02.c
++++ git/board/neo1973/gta02/gta02.c
+@@ -321,3 +321,7 @@ int neo1973_set_charge_mode(enum neo1973
+ 	/* FIXME */
+ 	return 0;
+ }
++
++void raise() {}
++void abort() {}
++
============================================================
--- packages/uboot/uboot-gta01_svn.bb	99839c5d6e1423ba68d992f0dfc835c2927b72c6
+++ packages/uboot/uboot-gta01_svn.bb	62211a5a9b706926a1f230401f042f8add732e37
@@ -1,58 +1,82 @@ PV = "1.2.0+svn${SRCDATE}"
 DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support"
 AUTHOR = "Harald Welte <laforge at openmoko.org>"
 LICENSE = "GPL"
 SECTION = "bootloader"
 PRIORITY = "optional"
 PV = "1.2.0+svn${SRCDATE}"
-PR = "r3"
+PR = "r10"
 
 PROVIDES = "virtual/bootloader"
 S = "${WORKDIR}/git"
 
 SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git \
            svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http \
-	   file://fix-arm920t-eabi.patch;patch=1"
+           file://uboot-eabi-fix-HACK.patch \
+           file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+"
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
 TARGET_LDFLAGS = ""
-UBOOT_MACHINES = "gta01v3 gta01v4 gta01bv2 gta01bv3"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1"
 
 do_quilt() {
-        mv ${WORKDIR}/patches ${S}/patches 
-        cd ${S}
-        quilt push -av
+        mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
         rm -Rf patches .pc
 }
 
+do_svnrev() {
+	FILE=${S}/tools/setlocalversion
+	OLDFILE=$FILE.old
+	NEWFILE=$FILE.new
+	cp $FILE $OLDFILE
+	LINES=`cat $OLDFILE | wc -l`
+	LINES_WE_WANT=$(($LINES-1))
+	LASTLINE=`cat $OLDFILE | tail -n 1`
+	cat $OLDFILE | head -n $LINES_WE_WANT > $NEWFILE
+	echo ${LASTLINE}_${PR} >> $NEWFILE
+	rm $FILE && mv $NEWFILE $FILE
+}
+
+do_configure_prepend() {
+	find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
+	find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
+	cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1
+}
+
 do_compile () {
-	chmod +x board/neo1973/split_by_variant.sh
-	for type in ram nand
+	chmod +x board/neo1973/gta*/split_by_variant.sh
+	for mach in ${UBOOT_MACHINES}
 	do
-		for mach in ${UBOOT_MACHINES}
-		do
-			oe_runmake ${mach}_config
-			oe_runmake clean
-			if [ ${type} == "ram" ]; then
-				echo 'PLATFORM_RELFLAGS += -DBUILD_FOR_RAM' >> board/neo1973/config.tmp
-			fi
-			oe_runmake all
-			mv u-boot.bin u-boot_${mach}_${type}.bin
-		done
+		oe_runmake ${mach}_config
+		oe_runmake clean
+		oe_runmake all
+		oe_runmake u-boot.udfu
+		if [ -f u-boot.udfu ]; then
+			mv u-boot.udfu u-boot_${mach}.bin
+		else
+			mv u-boot.bin u-boot_${mach}.bin
+		fi
+		if [ -f board/${mach}/lowlevel_foo.bin ]; then
+			mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin
+		fi
 	done
 }
 
 do_deploy () {
 	install -d ${DEPLOY_DIR_IMAGE}
-	for type in nand ram
+	for mach in ${UBOOT_MACHINES}
 	do
-		for mach in ${UBOOT_MACHINES}
-		do
-			install ${S}/u-boot_${mach}_${type}.bin ${DEPLOY_DIR_IMAGE}/u-boot_${type}-${mach}-${DATETIME}.bin
-		done
+		install ${S}/u-boot_${mach}.bin \
+		    ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PR}.bin
+		if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then
+			install ${S}/lowlevel_foo_${mach}.bin \
+			    ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PR}.bin
+		fi
 	done
 	install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage
 }
 
 do_deploy[dirs] = "${S}"
-addtask deploy before do_build after d%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list