r1086 - trunk/src/target/u-boot/patches
werner at sita.openmoko.org
werner at sita.openmoko.org
Fri Feb 23 20:49:08 CET 2007
Author: werner
Date: 2007-02-23 20:49:03 +0100 (Fri, 23 Feb 2007)
New Revision: 1086
Modified:
trunk/src/target/u-boot/patches/nand-dynamic_partitions.patch
trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
Log:
uboot-20061030-neo1973.patch:
include/configs/neo1973.h: added CFG_UBOOT_SIZE, the number of bytes to load
from NAND
uboot-s3c2410-nand.patch:
cpu/arm920t/start.S: use CFG_UBOOT_SIZE instead of hard-coded 0x30000
nand-dynamic_partitions.patch:
drivers/nand/nand_bbt.c (part_size): increased u-boot partition from 0x30000 to
0x40000 (through CFG_UBOOT_SIZE), reduced "splash" partition from 0x130000 to
0xa0000, and make "rootfs" partition just fill the rest
Modified: trunk/src/target/u-boot/patches/nand-dynamic_partitions.patch
===================================================================
--- trunk/src/target/u-boot/patches/nand-dynamic_partitions.patch 2007-02-23 19:20:04 UTC (rev 1085)
+++ trunk/src/target/u-boot/patches/nand-dynamic_partitions.patch 2007-02-23 19:49:03 UTC (rev 1086)
@@ -17,9 +17,9 @@
Index: u-boot/drivers/nand/nand_bbt.c
===================================================================
---- u-boot.orig/drivers/nand/nand_bbt.c 2007-02-16 23:53:09.000000000 +0100
-+++ u-boot/drivers/nand/nand_bbt.c 2007-02-16 23:53:36.000000000 +0100
-@@ -1049,4 +1049,61 @@
+--- u-boot.orig/drivers/nand/nand_bbt.c
++++ u-boot/drivers/nand/nand_bbt.c
+@@ -1049,4 +1049,63 @@ int nand_isbad_bbt (struct mtd_info *mtd
return 1;
}
@@ -31,8 +31,10 @@
+ "initrd" is sized such that it can hold two uncompressed 16 bit 640*480
+ images: 640*480*2*2 = 1228800 < 1245184. */
+
-+static unsigned int part_size[] = { 0x30000, 0x4000, 0x200000, 0x130000, 0x3c9c000 };
-+static char *part_names[] = { "u-boot", "u-boot_env", "kernel", "splash", "rootfs" };
++static unsigned int part_size[] = {
++ CFG_UBOOT_SIZE, 0x4000, 0x200000, 0xa0000, 0x3d5c000-CFG_UBOOT_SIZE };
++static char *part_names[] = {
++ "u-boot", "u-boot_env", "kernel", "splash", "rootfs" };
+
+int nand_create_mtd_dynpart(struct mtd_info *mtd)
+{
@@ -83,9 +85,9 @@
#endif
Index: u-boot/include/configs/neo1973.h
===================================================================
---- u-boot.orig/include/configs/neo1973.h 2007-02-16 23:53:34.000000000 +0100
-+++ u-boot/include/configs/neo1973.h 2007-02-16 23:53:36.000000000 +0100
-@@ -102,7 +102,7 @@
+--- u-boot.orig/include/configs/neo1973.h
++++ u-boot/include/configs/neo1973.h
+@@ -99,7 +99,7 @@
CFG_CMD_ELF | \
CFG_CMD_MISC | \
/* CFG_CMD_USB | */ \
@@ -94,7 +96,7 @@
CFG_CMD_DIAG | \
/* CFG_CMD_HWFLOW | */ \
CFG_CMD_SAVES | \
-@@ -212,13 +212,13 @@
+@@ -209,13 +209,13 @@
#define CONFIG_FAT 1
#define CONFIG_SUPPORT_VFAT 1
@@ -111,7 +113,7 @@
#endif
/* ATAG configuration */
-@@ -254,4 +254,7 @@
+@@ -251,4 +251,7 @@
#define CONFIG_S3C2410_NAND_BBT 1
@@ -121,9 +123,9 @@
#endif /* __CONFIG_H */
Index: u-boot/common/cmd_jffs2.c
===================================================================
---- u-boot.orig/common/cmd_jffs2.c 2007-02-16 23:53:09.000000000 +0100
-+++ u-boot/common/cmd_jffs2.c 2007-02-16 23:53:36.000000000 +0100
-@@ -2123,6 +2123,18 @@
+--- u-boot.orig/common/cmd_jffs2.c
++++ u-boot/common/cmd_jffs2.c
+@@ -2132,6 +2132,18 @@ int do_jffs2_mtdparts(cmd_tbl_t *cmdtp,
printf ("Usage:\n%s\n", cmdtp->usage);
return 1;
}
@@ -142,7 +144,7 @@
#endif /* #ifdef CONFIG_JFFS2_CMDLINE */
/***************************************************/
-@@ -2188,6 +2200,13 @@
+@@ -2197,6 +2209,13 @@ U_BOOT_CMD(
"<name> := '(' NAME ')'\n"
"<ro-flag> := when set to 'ro' makes partition read-only (not used, passed to kernel)\n"
);
Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch 2007-02-23 19:20:04 UTC (rev 1085)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch 2007-02-23 19:49:03 UTC (rev 1086)
@@ -695,7 +695,7 @@
===================================================================
--- /dev/null
+++ u-boot/include/configs/neo1973.h
-@@ -0,0 +1,257 @@
+@@ -0,0 +1,259 @@
+/*
+ * (C) Copyright 2006 OpenMoko, Inc.
+ * Author: Harald Welte <laforge at openmoko.org>
@@ -734,6 +734,8 @@
+#define CONFIG_S3C2410_NAND_SKIP_BAD 1
+#endif
+
++#define CFG_UBOOT_SIZE 0x40000 /* size of u-boot, for NAND loading */
++
+/*
+ * High Level Configuration Options
+ * (easy to change)
Modified: trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-02-23 19:20:04 UTC (rev 1085)
+++ trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch 2007-02-23 19:49:03 UTC (rev 1086)
@@ -5,9 +5,9 @@
Index: u-boot/cpu/arm920t/s3c24x0/Makefile
===================================================================
---- u-boot.orig/cpu/arm920t/s3c24x0/Makefile 2007-02-20 01:18:11.000000000 +0100
-+++ u-boot/cpu/arm920t/s3c24x0/Makefile 2007-02-20 01:18:51.000000000 +0100
-@@ -26,7 +26,7 @@
+--- u-boot.orig/cpu/arm920t/s3c24x0/Makefile
++++ u-boot/cpu/arm920t/s3c24x0/Makefile
+@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).a
COBJS = i2c.o interrupts.o serial.o speed.o \
@@ -18,8 +18,8 @@
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
Index: u-boot/cpu/arm920t/s3c24x0/nand.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/cpu/arm920t/s3c24x0/nand.c 2007-02-20 01:18:23.000000000 +0100
+--- /dev/null
++++ u-boot/cpu/arm920t/s3c24x0/nand.c
@@ -0,0 +1,185 @@
+/*
+ * (C) Copyright 2006 OpenMoko, Inc.
@@ -208,8 +208,8 @@
+#endif
Index: u-boot/cpu/arm920t/s3c24x0/nand_read.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/cpu/arm920t/s3c24x0/nand_read.c 2007-02-20 01:19:20.000000000 +0100
+--- /dev/null
++++ u-boot/cpu/arm920t/s3c24x0/nand_read.c
@@ -0,0 +1,98 @@
+/*
+ * nand_read.c: Simple NAND read functions for booting from NAND
@@ -311,8 +311,8 @@
+#endif /* CONFIG_S3C2410_NAND_BOOT */
Index: u-boot/cpu/arm920t/start.S
===================================================================
---- u-boot.orig/cpu/arm920t/start.S 2007-02-20 01:18:11.000000000 +0100
-+++ u-boot/cpu/arm920t/start.S 2007-02-20 01:18:23.000000000 +0100
+--- u-boot.orig/cpu/arm920t/start.S
++++ u-boot/cpu/arm920t/start.S
@@ -5,6 +5,10 @@
* Copyright (c) 2002 Alex Züpke <azu at sysgo.de>
* Copyright (c) 2002 Gary Jennejohn <gj at denx.de>
@@ -332,7 +332,7 @@
/*
-@@ -161,6 +166,7 @@
+@@ -161,6 +166,7 @@ reset:
#endif
#ifndef CONFIG_SKIP_RELOCATE_UBOOT
@@ -340,7 +340,7 @@
relocate: /* relocate U-Boot to RAM */
adr r0, _start /* r0 <- current position of code */
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
-@@ -177,6 +183,93 @@
+@@ -177,6 +183,93 @@ copy_loop:
stmia r1!, {r3-r10} /* copy to target address [r1] */
cmp r0, r2 /* until source end addreee [r2] */
ble copy_loop
@@ -386,7 +386,7 @@
+ @ copy u-boot to RAM
+ ldr r0, _TEXT_BASE
+ mov r1, #0x0
-+ mov r2, #0x30000
++ mov r2, #CFG_UBOOT_SIZE
+ bl nand_read_ll
+
+ tst r0, #0x0
@@ -436,8 +436,8 @@
/* Set up the stack */
Index: u-boot/include/s3c2410.h
===================================================================
---- u-boot.orig/include/s3c2410.h 2007-02-20 01:18:20.000000000 +0100
-+++ u-boot/include/s3c2410.h 2007-02-20 01:18:23.000000000 +0100
+--- u-boot.orig/include/s3c2410.h
++++ u-boot/include/s3c2410.h
@@ -38,12 +38,6 @@
#define S3C2410_ECCSIZE 512
#define S3C2410_ECCBYTES 3
@@ -451,7 +451,7 @@
/* S3C2410 device base addresses */
#define S3C24X0_MEMCTL_BASE 0x48000000
#define S3C24X0_USB_HOST_BASE 0x49000000
-@@ -65,9 +59,23 @@
+@@ -65,9 +59,23 @@ typedef enum {
#define S3C2410_SDI_BASE 0x5A000000
@@ -475,7 +475,7 @@
static inline S3C24X0_MEMCTL * S3C24X0_GetBase_MEMCTL(void)
{
-@@ -142,6 +150,7 @@
+@@ -142,6 +150,7 @@ static inline S3C2410_SDI * S3C2410_GetB
return (S3C2410_SDI * const)S3C2410_SDI_BASE;
}
More information about the commitlog
mailing list
