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

[werner at sita.openmoko.org]

Author: werner
Date: 2008-02-10 08:51:32 +0100 (Sun, 10 Feb 2008)
New Revision: 4034

Added:
   trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
Modified:
   trunk/src/target/u-boot/patches/series
Log:
Reverted the removal of the __board_nand_init change in 
uboot-s3c2410-nand.patch

series:
- re-added uboot-s3c2410-nand.patch

uboot-s3c2410-nand.patch:
- include/s3c24x0.h, cpu/arm920t/s3c24x0/nand.c: make board_nand_init a weak
  alias of __board_nand_init so that platform code can replace it



Modified: trunk/src/target/u-boot/patches/series
===================================================================
--- trunk/src/target/u-boot/patches/series	2008-02-10 06:54:23 UTC (rev 4033)
+++ trunk/src/target/u-boot/patches/series	2008-02-10 07:51:32 UTC (rev 4034)
@@ -23,6 +23,7 @@
 
 # this will be somewhat more difficult
 nand-dynamic_partitions.patch
+uboot-s3c2410-nand.patch
 uboot-s3c2410-norelocate_irqvec_cpy.patch
 uboot-usbtty-acm.patch
 uboot-s3c2410_udc.patch

Added: trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch	2008-02-10 06:54:23 UTC (rev 4033)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch	2008-02-10 07:51:32 UTC (rev 4034)
@@ -0,0 +1,26 @@
+Index: u-boot/cpu/arm920t/s3c24x0/nand.c
+===================================================================
+--- u-boot.orig/cpu/arm920t/s3c24x0/nand.c
++++ u-boot/cpu/arm920t/s3c24x0/nand.c
+@@ -122,7 +122,9 @@
+ }
+ #endif
+ 
+-int board_nand_init(struct nand_chip *nand)
++int board_nand_init(void) __attribute__((weak, alias("__board_nand_init")));
++
++int __board_nand_init(struct nand_chip *nand)
+ {
+ 	u_int32_t cfg;
+ 	u_int8_t tacls, twrph0, twrph1;
+Index: u-boot/include/s3c24x0.h
+===================================================================
+--- u-boot.orig/include/s3c24x0.h
++++ u-boot/include/s3c24x0.h
+@@ -1122,4 +1122,6 @@
+ 
+ #endif
+ 
++int __board_nand_init(struct nand_chip *nand);
++
+ #endif /*__S3C24X0_H__*/