[U-Boot-Users] [PATCH] 5/9: general

Robert Schwebel robert at schwebel.de
Thu Mar 6 13:34:21 CET 2003


GENERAL
=======

- compiler run breaks when inca-ip_sw.o is included. Somebody might want
  to find the real reason...
- mkimage should work when being called from _everywhere_...

Robert
-- 
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Braunschweiger Str. 79,  31134 Hildesheim, Germany
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
    Phone: +49-5121-28619-0 |  Fax: +49-5121-28619-4
-------------- next part --------------
diff -urN -x CVS -x ptx-patches -x logfile -x logfile1 u-boot/drivers/Makefile u-boot-ptx/drivers/Makefile
--- u-boot/drivers/Makefile	2003-03-02 12:24:50.000000000 +0100
+++ u-boot-ptx/drivers/Makefile	2003-03-02 18:15:39.000000000 +0100
@@ -29,12 +29,15 @@
 
 OBJS	= 3c589.o 5701rls.o bcm570x.o bcm570x_autoneg.o \
 	  cfb_console.o cs8900.o ct69000.o dc2114x.o \
-	  eepro100.o i8042.o inca-ip_sw.o \
+	  eepro100.o i8042.o \
 	  natsemi.o ns16550.o ns8382x.o ns87308.o \
 	  pci.o pci_auto.o pci_indirect.o \
 	  pcnet.o sed13806.o serial.o \
 	  smc91111.o smiLynxEM.o sym53c8xx.o \
 	  tigon3.o w83c553f.o
+# 	  Add this after i8042.o... doesn't work. [RS]
+#	  inca-ip_sw.o 
+
 
 all:	$(LIB)
 
diff -urN -x CVS -x ptx-patches -x logfile -x logfile1 u-boot/tools/mkimage.c u-boot-ptx/tools/mkimage.c
--- u-boot/tools/mkimage.c	2002-12-19 09:19:19.000000000 +0100
+++ u-boot-ptx/tools/mkimage.c	2002-12-19 09:22:12.000000000 +0100
@@ -17,6 +17,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
+#include <libgen.h>
 
 #if defined(__BEOS__) || defined(__NetBSD__) || defined(__APPLE__)
 #include <inttypes.h>
@@ -156,7 +157,7 @@
 	unsigned char *ptr;
 	char *name = "";
 
-	cmdname = *argv;
+	cmdname = basename(*argv);
 
 	addr = ep = 0;
 


More information about the U-Boot mailing list