Changeset 3749

Timestamp:

12/28/07 08:16:20 (5 years ago)

Author:

werner

Message:

Support board-specific NAND initialization, and use this to make "nand
createbbt" on GTA02 more efficient. (Run time decreases from about 145 seconds
to less than ten.)

uboot-s3c2410-nand.patch:

• cpu/arm920t/s3c24x0/nand.c (s3c2410_nand_enable_hwecc): is only used in this file and therefore should be "static"
• cpu/arm920t/s3c24x0/nand.c (board_nand_init): renamed to board_nand_init and added weak alias, so that we can have board-specific NAND initialization
• include/s3c24x0.h (board_nand_init): added prototype

uboot-gta02.patch:

• board/neo1973/gta02/Makefile: added nand.o to OBJS, wrapped overlong line
• board/neo1973/gta02/nand.c: override board_nand_init

neo1973-gsmver.patch:

• board/neo1973/gta02/Makefile: updated for nand.o addition

bbt-scan-second.patch:

• removed. The use of a "weak" symbol makes the mechanism more compact. Furthermore, since the default is NAND_BBT_SCANALLPAGES anyway, this patch didn't accomplish anything for GTA01.

The change to nand_block_bad in drivers/nand/nand_base.c is conceptually
sound if we assume that nand_block_bad should indicate all bad blocks also in
the absence of a bad block table. However, since we have a bad block table on
all OpenMoko? devices, this issue does not arise.

Location:

trunk/src/target/u-boot/patches

Files:

• bbt-scan-second.patch (deleted)
• neo1973-gsmver.patch (modified) (3 diffs)
• uboot-gta02.patch (modified) (4 diffs)
• uboot-s3c2410-nand.patch (modified) (4 diffs)

trunk/src/target/u-boot/patches/neo1973-gsmver.patch

@@ -11 +11 @@
 --- u-boot.orig/board/neo1973/common/cmd_neo1973.c
 +++ u-boot/board/neo1973/common/cmd_neo1973.c
-@@ -77,8 +77,10 @@
+@@ -85,8 +85,10 @@
                         goto out_help;
                 if (!strcmp(argv[2], "on"))
@@ -23 +23 @@
                 if (argc < 3)
                         goto out_help;
-@@ -121,7 +123,7 @@
-        "neo1973 charger off - disable charging\n"
+@@ -130,7 +132,7 @@
         "neo1973 backlight (on|off) - switch backlight on or off\n"
+        "neo1973 led num (on|off) - switch LED number 'num' on or off\n"
         "neo1973 vibrator (on|off) - switch vibrator on or off\n"
 -       "neo1973 gsm (on|off) - switch GSM Modem on or off\n"
@@ -134 +134 @@
 --- u-boot.orig/board/neo1973/gta02/Makefile
 +++ u-boot/board/neo1973/gta02/Makefile
-@@ -25,7 +25,7 @@
- 
+@@ -26,6 +26,7 @@
  LIB    = lib$(BOARD).a
  
--OBJS   := gta02.o pcf50633.o ../common/cmd_neo1973.o ../common/jbt6k74.o ../common/udc.o ../common/bootmenu.o
-+OBJS   := gta02.o pcf50633.o ../common/cmd_neo1973.o ../common/gsmver.o ../common/jbt6k74.o ../common/udc.o ../common/bootmenu.o
+ OBJS   := gta02.o pcf50633.o nand.o ../common/cmd_neo1973.o \
++          ../common/gsmver.o \
+           ../common/jbt6k74.o ../common/udc.o ../common/bootmenu.o
  SOBJS  := ../common/lowlevel_init.o
  
- .PHONY:        all

trunk/src/target/u-boot/patches/uboot-gta02.patch

@@ -5 +5 @@
 --- u-boot.orig/Makefile
 +++ u-boot/Makefile
-@@ -2250,6 +2250,13 @@
+@@ -2253,6 +2253,13 @@
  sbc2410x_config: unconfig
         @$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
@@ -23 +23 @@
 --- /dev/null
 +++ u-boot/board/neo1973/gta02/Makefile
-@@ -0,0 +1,64 @@
+@@ -0,0 +1,65 @@
 +#
 +# (C) Copyright 2000, 2001, 2002
@@ -51 +51 @@
 +LIB    = lib$(BOARD).a
 +
-+OBJS   := gta02.o pcf50633.o ../common/cmd_neo1973.o ../common/jbt6k74.o ../common/udc.o ../common/bootmenu.o
++OBJS   := gta02.o pcf50633.o nand.o ../common/cmd_neo1973.o \
++          ../common/jbt6k74.o ../common/udc.o ../common/bootmenu.o
 +SOBJS  := ../common/lowlevel_init.o
 +
@@ -2346 +2347 @@
 +
 +#endif /* _GLAMO_REGS_H */
+Index: u-boot/board/neo1973/gta02/nand.c
+===================================================================
+--- /dev/null
++++ u-boot/board/neo1973/gta02/nand.c
+@@ -0,0 +1,47 @@
++/*
++ * nand.c - Board-specific NAND setup
++ *
++ * Copyright (C) 2007 by OpenMoko, Inc.
++ * Written by Werner Almesberger <werner@openmoko.org>
++ * All Rights Reserved
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ */
++
++
++#include "config.h" /* nand.h needs NAND_MAX_CHIPS */
++#include "linux/mtd/mtd.h"
++#include "linux/mtd/nand.h"
++#include "s3c2440.h"
++
++
++/* Derived from drivers/nand/nand_bbt.c:largepage_flashbased */
++
++static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
++
++static struct nand_bbt_descr badblock_pattern = {
++       .options = NAND_BBT_SCAN2NDPAGE,
++       .offs = 0,
++       .len = 1,
++       .pattern = scan_ff_pattern
++};
++
++
++int board_nand_init(struct nand_chip *nand)
++{
++       nand->badblock_pattern = &badblock_pattern;
++       return __board_nand_init(nand);
++}

trunk/src/target/u-boot/patches/uboot-s3c2410-nand.patch

@@ -20 +20 @@
 --- /dev/null
 +++ u-boot/cpu/arm920t/s3c24x0/nand.c
-@@ -0,0 +1,179 @@
+@@ -0,0 +1,183 @@
 +/*
 + * (C) Copyright 2006 OpenMoko, Inc.
@@ -114 +114 @@
 +
 +#ifdef CONFIG_S3C2410_NAND_HWECC
-+void s3c2410_nand_enable_hwecc(struct mtd_info *mtd, int mode)
++static void s3c2410_nand_enable_hwecc(struct mtd_info *mtd, int mode)
 +{
 +       DEBUGN("s3c2410_nand_enable_hwecc(%p, %d)\n", mtd ,mode);
@@ -145 +145 @@
 +#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;
@@ -200 +204 @@
 +#endif
 +#endif
+Index: u-boot/include/s3c24x0.h
+===================================================================
+--- u-boot.orig/include/s3c24x0.h
++++ u-boot/include/s3c24x0.h
+@@ -1132,4 +1132,6 @@
+ 
+ #endif
+ 
++int __board_nand_init(struct nand_chip *nand);
++
+ #endif /*__S3C24X0_H__*/