r1134 - trunk/src/target/u-boot/patches

laforge at sita.openmoko.org laforge at sita.openmoko.org
Mon Feb 26 14:15:55 CET 2007


Author: laforge
Date: 2007-02-26 14:15:54 +0100 (Mon, 26 Feb 2007)
New Revision: 1134

Modified:
   trunk/src/target/u-boot/patches/uboot-arm920t_cp15_cmd.patch
Log:
sync cmd_arm920 with upstream uboot changes in makefile


Modified: trunk/src/target/u-boot/patches/uboot-arm920t_cp15_cmd.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-arm920t_cp15_cmd.patch	2007-02-26 07:24:58 UTC (rev 1133)
+++ trunk/src/target/u-boot/patches/uboot-arm920t_cp15_cmd.patch	2007-02-26 13:15:54 UTC (rev 1134)
@@ -3,23 +3,23 @@
 
 Signed-off-by: Harald Welte <laforge at openmoko.org>
 
-Index: u-boot.git/common/Makefile
+Index: u-boot/common/Makefile
 ===================================================================
---- u-boot.git.orig/common/Makefile	2007-02-05 20:37:13.000000000 +0100
-+++ u-boot.git/common/Makefile	2007-02-05 20:37:17.000000000 +0100
-@@ -28,7 +28,7 @@
+--- u-boot.orig/common/Makefile	2007-02-26 14:11:57.000000000 +0100
++++ u-boot/common/Makefile	2007-02-26 14:14:16.000000000 +0100
+@@ -27,7 +27,7 @@
+ 
  AOBJS	=
  
- COBJS	= main.o ACEX1K.o altera.o bedbug.o circbuf.o \
--	  cmd_ace.o cmd_autoscript.o \
-+	  cmd_ace.o cmd_arm920.o cmd_autoscript.o \
+-COBJS	= main.o ACEX1K.o altera.o bedbug.o circbuf.o cmd_autoscript.o \
++COBJS	= main.o ACEX1K.o altera.o bedbug.o circbuf.o cmd_arm920.o cmd_autoscript.o \
  	  cmd_bdinfo.o cmd_bedbug.o cmd_bmp.o cmd_boot.o cmd_bootm.o \
  	  cmd_cache.o cmd_console.o \
  	  cmd_date.o cmd_dcr.o cmd_diag.o cmd_display.o cmd_doc.o cmd_dtt.o \
-Index: u-boot.git/common/cmd_arm920.c
+Index: u-boot/common/cmd_arm920.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/common/cmd_arm920.c	2007-02-05 20:37:41.000000000 +0100
++++ u-boot/common/cmd_arm920.c	2007-02-26 14:14:36.000000000 +0100
 @@ -0,0 +1,64 @@
 +/*
 + * (C) Copyright 2006 by OpenMoko, Inc.
@@ -66,7 +66,7 @@
 +		printf("Usage:\n%s\n", cmdtp->usage);
 +		return 1;
 +	}
-+	
++
 +	if (!strcmp(argv[2], "write")) {
 +		ulong val = simple_strtoul(argv[3], NULL, 16);
 +		printf("setting cp15c1 to 0x%08x\n", val);
@@ -85,10 +85,10 @@
 +	NULL
 +);
 +#endif	/* CFG_CMD_BDI */
-Index: u-boot.git/cpu/arm920t/cpu.c
+Index: u-boot/cpu/arm920t/cpu.c
 ===================================================================
---- u-boot.git.orig/cpu/arm920t/cpu.c	2007-02-05 20:37:13.000000000 +0100
-+++ u-boot.git/cpu/arm920t/cpu.c	2007-02-05 20:37:17.000000000 +0100
+--- u-boot.orig/cpu/arm920t/cpu.c	2007-02-26 04:37:19.000000000 +0100
++++ u-boot/cpu/arm920t/cpu.c	2007-02-26 14:13:31.000000000 +0100
 @@ -38,7 +38,7 @@
  #endif
  
@@ -107,4 +107,3 @@
  {
  #ifdef MMU_DEBUG
  	printf ("write %08lx to p15/c1\n", value);
-





More information about the commitlog mailing list