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

[werner at sita.openmoko.org]

Author: werner
Date: 2007-04-04 10:23:29 +0200 (Wed, 04 Apr 2007)
New Revision: 1651

Modified:
   trunk/src/target/u-boot/patches/env_nand_oob.patch
Log:
common/Makefile: updated patch for latest upstream changes



Modified: trunk/src/target/u-boot/patches/env_nand_oob.patch
===================================================================
--- trunk/src/target/u-boot/patches/env_nand_oob.patch	2007-04-04 07:26:46 UTC (rev 1650)
+++ trunk/src/target/u-boot/patches/env_nand_oob.patch	2007-04-04 08:23:29 UTC (rev 1651)
@@ -17,8 +17,8 @@
 
 Index: u-boot/common/env_nand.c
 ===================================================================
---- u-boot.orig/common/env_nand.c	2007-02-16 23:53:09.000000000 +0100
-+++ u-boot/common/env_nand.c	2007-02-16 23:53:34.000000000 +0100
+--- u-boot.orig/common/env_nand.c
++++ u-boot/common/env_nand.c
 @@ -271,6 +271,33 @@
  	ulong total;
  	int ret;
@@ -55,8 +55,8 @@
    	if (ret || total != CFG_ENV_SIZE)
 Index: u-boot/common/environment.c
 ===================================================================
---- u-boot.orig/common/environment.c	2007-02-16 23:53:09.000000000 +0100
-+++ u-boot/common/environment.c	2007-02-16 23:53:34.000000000 +0100
+--- u-boot.orig/common/environment.c
++++ u-boot/common/environment.c
 @@ -29,6 +29,12 @@
  #undef	__ASSEMBLY__
  #include <environment.h>
@@ -72,8 +72,8 @@
   * crap on symbol names, not TARGETS.
 Index: u-boot/include/environment.h
 ===================================================================
---- u-boot.orig/include/environment.h	2007-02-16 23:53:09.000000000 +0100
-+++ u-boot/include/environment.h	2007-02-16 23:53:34.000000000 +0100
+--- u-boot.orig/include/environment.h
++++ u-boot/include/environment.h
 @@ -70,6 +70,10 @@
  #endif	/* CFG_ENV_IS_IN_FLASH */
  
@@ -95,21 +95,21 @@
  
 Index: u-boot/common/Makefile
 ===================================================================
---- u-boot.orig/common/Makefile	2007-02-16 23:53:15.000000000 +0100
-+++ u-boot/common/Makefile	2007-02-16 23:53:34.000000000 +0100
-@@ -32,7 +32,7 @@
+--- u-boot.orig/common/Makefile
++++ u-boot/common/Makefile
+@@ -31,7 +31,7 @@
  	  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 \
 -	  cmd_eeprom.o cmd_elf.o cmd_ext2.o \
 +	  cmd_dynenv.o cmd_eeprom.o cmd_elf.o cmd_ext2.o \
- 	  cmd_fat.o cmd_fdc.o cmd_fdos.o cmd_flash.o cmd_fpga.o \
+ 	  cmd_fat.o cmd_fdc.o cmd_fdt.o cmd_fdos.o cmd_flash.o cmd_fpga.o \
  	  cmd_i2c.o cmd_ide.o cmd_immap.o cmd_itest.o cmd_jffs2.o \
  	  cmd_load.o cmd_log.o \
 Index: u-boot/common/cmd_dynenv.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/common/cmd_dynenv.c	2007-02-16 23:53:34.000000000 +0100
+--- /dev/null
++++ u-boot/common/cmd_dynenv.c
 @@ -0,0 +1,85 @@
 +/*
 + * (C) Copyright 2006-2007 OpenMoko, Inc.