r923 - trunk/src/target/u-boot/patches
laforge at sita.openmoko.org
laforge at sita.openmoko.org
Thu Feb 8 21:07:01 CET 2007
Author: laforge
Date: 2007-02-08 21:07:01 +0100 (Thu, 08 Feb 2007)
New Revision: 923
Modified:
trunk/src/target/u-boot/patches/uboot-s3c2410-nand_mmc.patch
Log:
nand_board_init() now is an 'int' function, not 'void'
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410-nand_mmc.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-nand_mmc.patch 2007-02-08 19:20:12 UTC (rev 922)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-nand_mmc.patch 2007-02-08 20:07:01 UTC (rev 923)
@@ -3,10 +3,10 @@
Signed-off-by: Harald Welte <laforge at openmoko.org>
-Index: u-boot.git/cpu/arm920t/s3c24x0/Makefile
+Index: u-boot/cpu/arm920t/s3c24x0/Makefile
===================================================================
---- u-boot.git.orig/cpu/arm920t/s3c24x0/Makefile 2007-02-06 11:38:46.000000000 +0100
-+++ u-boot.git/cpu/arm920t/s3c24x0/Makefile 2007-02-06 11:52:26.000000000 +0100
+--- u-boot.orig/cpu/arm920t/s3c24x0/Makefile 2007-02-08 14:33:31.000000000 +0100
++++ u-boot/cpu/arm920t/s3c24x0/Makefile 2007-02-08 14:45:09.000000000 +0100
@@ -26,7 +26,7 @@
LIB = $(obj)lib$(SOC).a
@@ -16,10 +16,10 @@
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
-Index: u-boot.git/cpu/arm920t/s3c24x0/mmc.c
+Index: u-boot/cpu/arm920t/s3c24x0/mmc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/cpu/arm920t/s3c24x0/mmc.c 2007-02-06 11:52:26.000000000 +0100
++++ u-boot/cpu/arm920t/s3c24x0/mmc.c 2007-02-08 14:45:09.000000000 +0100
@@ -0,0 +1,569 @@
+/*
+ * u-boot S3C2410 MMC/SD card driver
@@ -590,11 +590,11 @@
+}
+
+#endif /* CONFIG_MMC */
-Index: u-boot.git/cpu/arm920t/s3c24x0/nand.c
+Index: u-boot/cpu/arm920t/s3c24x0/nand.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/cpu/arm920t/s3c24x0/nand.c 2007-02-06 11:52:26.000000000 +0100
-@@ -0,0 +1,213 @@
++++ u-boot/cpu/arm920t/s3c24x0/nand.c 2007-02-08 20:50:24.000000000 +0100
+@@ -0,0 +1,215 @@
+/*
+ * (C) Copyright 2006 OpenMoko, Inc.
+ * Author: Harald Welte <laforge at openmoko.org>
@@ -745,7 +745,7 @@
+ while (!s3c2410_dev_ready(mtd));
+}
+
-+void board_nand_init(struct nand_chip *nand)
++int board_nand_init(struct nand_chip *nand)
+{
+ u_int32_t cfg;
+ u_int8_t tacls, twrph0, twrph1;
@@ -802,16 +802,18 @@
+#endif
+
+ DEBUGN("end of nand_init\n");
++
++ return 0;
+}
+
+#else
+ #error "U-Boot legacy NAND support not available for S3C2410"
+#endif
+#endif
-Index: u-boot.git/cpu/arm920t/s3c24x0/nand_read.c
+Index: u-boot/cpu/arm920t/s3c24x0/nand_read.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/cpu/arm920t/s3c24x0/nand_read.c 2007-02-06 11:52:26.000000000 +0100
++++ u-boot/cpu/arm920t/s3c24x0/nand_read.c 2007-02-08 20:49:01.000000000 +0100
@@ -0,0 +1,76 @@
+/*
+ * nand_read.c: Simple NAND read functions for booting from NAND
@@ -889,10 +891,10 @@
+}
+
+#endif /* CONFIG_S3C2410_NAND_BOOT */
-Index: u-boot.git/cpu/arm920t/start.S
+Index: u-boot/cpu/arm920t/start.S
===================================================================
---- u-boot.git.orig/cpu/arm920t/start.S 2007-02-06 11:38:46.000000000 +0100
-+++ u-boot.git/cpu/arm920t/start.S 2007-02-06 11:52:26.000000000 +0100
+--- u-boot.orig/cpu/arm920t/start.S 2007-02-08 14:33:32.000000000 +0100
++++ u-boot/cpu/arm920t/start.S 2007-02-08 20:48:51.000000000 +0100
@@ -5,6 +5,10 @@
* Copyright (c) 2002 Alex Züpke <azu at sysgo.de>
* Copyright (c) 2002 Gary Jennejohn <gj at denx.de>
@@ -1024,10 +1026,10 @@
#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
-Index: u-boot.git/include/asm-arm/arch-s3c24x0/mmc.h
+Index: u-boot/include/asm-arm/arch-s3c24x0/mmc.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/include/asm-arm/arch-s3c24x0/mmc.h 2007-02-06 11:52:26.000000000 +0100
++++ u-boot/include/asm-arm/arch-s3c24x0/mmc.h 2007-02-08 14:45:09.000000000 +0100
@@ -0,0 +1,112 @@
+/*
+ * linux/drivers/mmc/mmc_pxa.h
@@ -1141,10 +1143,10 @@
+
+
+#endif /* __MMC_PXA_P_H__ */
-Index: u-boot.git/include/asm-arm/arch-s3c24x0/regs-sdi.h
+Index: u-boot/include/asm-arm/arch-s3c24x0/regs-sdi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot.git/include/asm-arm/arch-s3c24x0/regs-sdi.h 2007-02-06 11:52:26.000000000 +0100
++++ u-boot/include/asm-arm/arch-s3c24x0/regs-sdi.h 2007-02-08 14:45:09.000000000 +0100
@@ -0,0 +1,110 @@
+/* linux/include/asm/arch-s3c2410/regs-sdi.h
+ *
@@ -1256,10 +1258,10 @@
+#define S3C2410_SDIIMSK_RXFIFOHALF (1<<0)
+
+#endif /* __ASM_ARM_REGS_SDI */
-Index: u-boot.git/include/s3c2410.h
+Index: u-boot/include/s3c2410.h
===================================================================
---- u-boot.git.orig/include/s3c2410.h 2007-02-06 11:38:46.000000000 +0100
-+++ u-boot.git/include/s3c2410.h 2007-02-06 11:52:26.000000000 +0100
+--- u-boot.orig/include/s3c2410.h 2007-02-08 14:33:46.000000000 +0100
++++ u-boot/include/s3c2410.h 2007-02-08 20:48:49.000000000 +0100
@@ -38,12 +38,6 @@
#define S3C2410_ECCSIZE 512
#define S3C2410_ECCBYTES 3
@@ -1305,10 +1307,10 @@
/* ISR */
#define pISR_RESET (*(unsigned *)(_ISR_STARTADDRESS+0x0))
-Index: u-boot.git/include/s3c24x0.h
+Index: u-boot/include/s3c24x0.h
===================================================================
---- u-boot.git.orig/include/s3c24x0.h 2007-02-06 11:38:46.000000000 +0100
-+++ u-boot.git/include/s3c24x0.h 2007-02-06 11:52:26.000000000 +0100
+--- u-boot.orig/include/s3c24x0.h 2007-02-08 14:33:46.000000000 +0100
++++ u-boot/include/s3c24x0.h 2007-02-08 14:45:09.000000000 +0100
@@ -637,13 +637,7 @@
S3C24X0_REG32 SDIDCNT;
S3C24X0_REG32 SDIDSTA;
More information about the commitlog
mailing list
