November 2008 - U-Boot

[U-Boot] [PATCH 4/4 V2] add Siemens SX1 Machine support
by Jean-Christophe PLAGNIOL-VILLARD 18 Nov '08

18 Nov '08

Siemens SX1 Cellphone V1 - ARM OMAP310 processor - SRAM 192 kB - SDRAM 32 MB at 0x10000000 - Boot flash 16 MB at 0x00000000 - Application flash 8 MB at 0x04000000 - 3 serial ports - 1 SecureDigital - 1 LCD display - 1 RTC Siemens SX1 Cellphone V2 - ARM OMAP310 processor - SRAM 192 kB - SDRAM 32 MB at 0x10000000 - Boot flash 32 MB at 0x00000000 - 3 serial ports - 1 SecureDigital - 1 LCD display - 1 RTC U-Boot (mainline) and Linux kernel (2.6.26) tested Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> --- add qemu-doc and fix QEMUMachine var name (invert between v1 and v2) Best Regards, J. Makefile.target | 2 +- hw/boards.h | 4 + hw/omap_sx1.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++ qemu-doc.texi | 26 ++++++ target-arm/machine.c | 2 + 5 files changed, 269 insertions(+), 1 deletions(-) create mode 100644 hw/omap_sx1.c diff --git a/Makefile.target b/Makefile.target index a15cbe0..03db021 100644 --- a/Makefile.target +++ b/Makefile.target @@ -727,7 +727,7 @@ OBJS+= pflash_cfi01.o gumstix.o OBJS+= zaurus.o ide.o serial.o nand.o ecc.o spitz.o tosa.o tc6393xb.o OBJS+= omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o OBJS+= omap2.o omap_dss.o soc_dma.o -OBJS+= palm.o tsc210x.o +OBJS+= omap_sx1.o palm.o tsc210x.o OBJS+= nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o OBJS+= tsc2005.o bt-hci-csr.o OBJS+= mst_fpga.o mainstone.o diff --git a/hw/boards.h b/hw/boards.h index d30c0fc..a7b8126 100644 --- a/hw/boards.h +++ b/hw/boards.h @@ -86,6 +86,10 @@ extern QEMUMachine spitzpda_machine; extern QEMUMachine borzoipda_machine; extern QEMUMachine terrierpda_machine; +/* omap_sx1.c */ +extern QEMUMachine sx1_machine_v1; +extern QEMUMachine sx1_machine_v2; + /* palm.c */ extern QEMUMachine palmte_machine; diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c new file mode 100644 index 0000000..e699549 --- /dev/null +++ b/hw/omap_sx1.c @@ -0,0 +1,236 @@ +/* omap_sx1.c Support for the Siemens SX1 device + * + * Copyright (C) 2008 + * Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> + * Copyright (C) 2007 Vladimir Ananiev <vovan888(a)gmail.com> + * + * based on PalmOne's (TM) PDAs support (palm.c) + */ + +/* + * PalmOne's (TM) PDAs. + * + * Copyright (C) 2006-2007 Andrzej Zaborowski <balrog(a)zabor.org> + * + * 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 "hw.h" +#include "sysemu.h" +#include "console.h" +#include "omap.h" +#include "boards.h" +#include "arm-misc.h" +#include "flash.h" + +/*****************************************************************************/ +/* Siemens SX1 Cellphone V1 */ +/* - ARM OMAP310 processor + * - SRAM 192 kB + * - SDRAM 32 MB at 0x10000000 + * - Boot flash 16 MB at 0x00000000 + * - Application flash 8 MB at 0x04000000 + * - 3 serial ports + * - 1 SecureDigital + * - 1 LCD display + * - 1 RTC + */ + +/*****************************************************************************/ +/* Siemens SX1 Cellphone V2 */ +/* - ARM OMAP310 processor + * - SRAM 192 kB + * - SDRAM 32 MB at 0x10000000 + * - Boot flash 32 MB at 0x00000000 + * - 3 serial ports + * - 1 SecureDigital + * - 1 LCD display + * - 1 RTC + */ + +static uint32_t static_readb(void *opaque, target_phys_addr_t offset) +{ + uint32_t *val = (uint32_t *) opaque; + + return *val >> ((offset & 3) << 3); +} + +static uint32_t static_readh(void *opaque, target_phys_addr_t offset) +{ + uint32_t *val = (uint32_t *) opaque; + + return *val >> ((offset & 1) << 3); +} + +static uint32_t static_readw(void *opaque, target_phys_addr_t offset) +{ + uint32_t *val = (uint32_t *) opaque; + + return *val >> ((offset & 0) << 3); +} + +static void static_write(void *opaque, target_phys_addr_t offset, + uint32_t value) +{ +#ifdef SPY + printf("%s: value %08lx written at " PA_FMT "\n", + __FUNCTION__, value, offset); +#endif +} + +static CPUReadMemoryFunc *static_readfn[] = { + static_readb, + static_readh, + static_readw, +}; + +static CPUWriteMemoryFunc *static_writefn[] = { + static_write, + static_write, + static_write, +}; + +#define sdram_size 0x02000000 +#define sector_size (128 * 1024) +#define flash0_size (16 * 1024 * 1024) +#define flash1_size ( 8 * 1024 * 1024) +#define flash2_size (32 * 1024 * 1024) +#define total_ram_v1 (sdram_size + flash0_size + flash1_size + OMAP15XX_SRAM_SIZE) +#define total_ram_v2 (sdram_size + flash2_size + OMAP15XX_SRAM_SIZE) + +static struct arm_boot_info sx1_binfo = { + .loader_start = OMAP_EMIFF_BASE, + .ram_size = sdram_size, + .board_id = 0x265, +}; + +static void sx1_init(ram_addr_t ram_size, int vga_ram_size, + const char *boot_device, DisplayState *ds, + const char *kernel_filename, const char *kernel_cmdline, + const char *initrd_filename, const char *cpu_model, + const int version) +{ + struct omap_mpu_state_s *cpu; + int io; + static uint32_t cs0val = 0x00213090; + static uint32_t cs1val = 0x00215070; + static uint32_t cs2val = 0x00001139; + static uint32_t cs3val = 0x00001139; + ram_addr_t phys_flash; + int index; + int fl_idx; + uint32_t flash_size = flash0_size; + + if (version == 2) { + flash_size = flash2_size; + } + + cpu = omap310_mpu_init(sx1_binfo.ram_size, ds, cpu_model); + + /* External Flash (EMIFS) */ + cpu_register_physical_memory(OMAP_CS0_BASE, flash_size, + (phys_flash = qemu_ram_alloc(flash_size)) | IO_MEM_ROM); + + io = cpu_register_io_memory(0, static_readfn, static_writefn, &cs0val); + cpu_register_physical_memory(OMAP_CS0_BASE + flash_size, + OMAP_CS0_SIZE - flash_size, io); + io = cpu_register_io_memory(0, static_readfn, static_writefn, &cs2val); + cpu_register_physical_memory(OMAP_CS2_BASE, OMAP_CS2_SIZE, io); + io = cpu_register_io_memory(0, static_readfn, static_writefn, &cs3val); + cpu_register_physical_memory(OMAP_CS3_BASE, OMAP_CS3_SIZE, io); + + fl_idx = 0; + + if ((index = drive_get_index(IF_PFLASH, 0, fl_idx)) > -1) { + if (!pflash_cfi01_register(OMAP_CS0_BASE, qemu_ram_alloc(flash_size), + drives_table[index].bdrv, sector_size, flash_size / sector_size, + 4, 0, 0, 0, 0)) { + fprintf(stderr, "qemu: Error registering flash memory %d.\n", + fl_idx); + } + fl_idx++; + } + + if ((version == 1) && (index = drive_get_index(IF_PFLASH, 0, fl_idx)) > -1) { + cpu_register_physical_memory(OMAP_CS1_BASE, flash1_size, + (phys_flash = qemu_ram_alloc(flash1_size)) | IO_MEM_ROM); + io = cpu_register_io_memory(0, static_readfn, static_writefn, &cs1val); + cpu_register_physical_memory(OMAP_CS1_BASE + flash1_size, + OMAP_CS1_SIZE - flash1_size, io); + + if (!pflash_cfi01_register(OMAP_CS1_BASE, qemu_ram_alloc(flash1_size), + drives_table[index].bdrv, sector_size, flash1_size / sector_size, + 4, 0, 0, 0, 0)) { + fprintf(stderr, "qemu: Error registering flash memory %d.\n", + fl_idx); + } + fl_idx++; + } else { + io = cpu_register_io_memory(0, static_readfn, static_writefn, &cs1val); + cpu_register_physical_memory(OMAP_CS1_BASE, OMAP_CS1_SIZE, io); + } + + if (!kernel_filename && !fl_idx) { + fprintf(stderr, "Kernel or Flash image must be specified\n"); + exit(1); + } + + /* Load the kernel. */ + if (kernel_filename) { + /* Start at bootloader. */ + cpu->env->regs[15] = sx1_binfo.loader_start; + + sx1_binfo.kernel_filename = kernel_filename; + sx1_binfo.kernel_cmdline = kernel_cmdline; + sx1_binfo.initrd_filename = initrd_filename; + arm_load_kernel(cpu->env, &sx1_binfo); + } else { + cpu->env->regs[15] = 0x00000000; + } + + dpy_resize(ds, 640, 480); +} + +static void sx1_init_v1(ram_addr_t ram_size, int vga_ram_size, + const char *boot_device, DisplayState *ds, + const char *kernel_filename, const char *kernel_cmdline, + const char *initrd_filename, const char *cpu_model) +{ + sx1_init(ram_size, vga_ram_size, boot_device, ds, kernel_filename, + kernel_cmdline, initrd_filename, cpu_model, 1); +} + +static void sx1_init_v2(ram_addr_t ram_size, int vga_ram_size, + const char *boot_device, DisplayState *ds, + const char *kernel_filename, const char *kernel_cmdline, + const char *initrd_filename, const char *cpu_model) +{ + sx1_init(ram_size, vga_ram_size, boot_device, ds, kernel_filename, + kernel_cmdline, initrd_filename, cpu_model, 2); +} + +QEMUMachine sx1_machine_v2 = { + .name = "sx1", + .desc = "Siemens SX1 (OMAP310) V2", + .init = sx1_init_v2, + .ram_require = total_ram_v2 | RAMSIZE_FIXED, +}; + +QEMUMachine sx1_machine_v1 = { + .name = "sx1-v1", + .desc = "Siemens SX1 (OMAP310) V1", + .init = sx1_init_v1, + .ram_require = total_ram_v1 | RAMSIZE_FIXED, +}; diff --git a/qemu-doc.texi b/qemu-doc.texi index 1735d92..9ed89f7 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2707,6 +2707,32 @@ Secure Digital card connected to OMAP MMC/SD host Three on-chip UARTs @end itemize +The Siemens SX1 models v1 and v2 (default) emulation with U-Boot and Linux +Mainline support. +The emlulaton includes the following elements: + +@itemize @minus +@item +Texas Instruments OMAP310 System-on-chip (ARM 925T core) +@item +ROM and RAM memories (ROM firmware image can be loaded with -pflash) +V1 +1 Flash of 16MB and 1 Flash of 8MB +V2 +1 Flash of 32MB +@item +On-chip LCD controller +@item +On-chip Real Time Clock +@item +TI TSC2102i touchscreen controller / analog-digital converter / Audio +CODEC, connected through MicroWire and I@math{^2}S busses +@item +Secure Digital card connected to OMAP MMC/SD host +@item +Three on-chip UARTs +@end itemize + Nokia N800 and N810 internet tablets (known also as RX-34 and RX-44 / 48) emulation supports the following elements: diff --git a/target-arm/machine.c b/target-arm/machine.c index 42ff584..8f7d0c2 100644 --- a/target-arm/machine.c +++ b/target-arm/machine.c @@ -11,6 +11,8 @@ void register_machines(void) qemu_register_machine(&spitzpda_machine); qemu_register_machine(&borzoipda_machine); qemu_register_machine(&terrierpda_machine); + qemu_register_machine(&sx1_machine_v1); + qemu_register_machine(&sx1_machine_v2); qemu_register_machine(&palmte_machine); qemu_register_machine(&n800_machine); qemu_register_machine(&n810_machine); -- 1.5.6.5

2 2

Re: [U-Boot] [PATCH v2] mpc83xx: New board support SIMPC8313
by Ron Madrid 18 Nov '08

18 Nov '08

> Marvell 88E1118 PHY, and PCI host support. The board also has a FPGA connected > to the eLBC providing glue logic to a TMS320C67xx DSP. > Please split (80 chars max) I'm not sure why this happened. I did everything using git and did it the same as last time, and last time appropriate line wrapping was applied. > > -#!/bin/sh > > +8#!/bin/sh > ????? That was an error that I caught immediately and resolve with the third version of my patch which was sent briefly after the second one. > why not create a nand_spl_fixed_sdram()? I can. I hadn't really considered it. I am concerned however that this will increase the size of my nand_spl section and might perhaps spill over the 4K limit. I'll try and see what happens. > why not split this file in two and do the conditinal compile via Makefile? I haven't seen that done with other boards utilizing the nand_spl parts of the code. It seems that other boards all use the files that already exist in the main board directory and have #define's to differentiate the builds. If splitting the file in two is what should actually be done, I can do that as well. > please use $@ and $< to simplify it I am in the process of working on this one. Thanks for the feedback. Ron

1 0

[U-Boot] [PATCH] MIPS: Add board_early_init_f() to init_sequence
by Stefan Roese 18 Nov '08

18 Nov '08

This patch adds the board_early_init_f() call to the MIPS init sequence. A weak dummy implementation is also added which can be overridden by a board specific version. This will be used by the upcoming VCTH board support. Signed-off-by: Stefan Roese <sr(a)denx.de> --- lib_mips/board.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/lib_mips/board.c b/lib_mips/board.c index 77e1cc8..01dda69 100644 --- a/lib_mips/board.c +++ b/lib_mips/board.c @@ -70,6 +70,15 @@ static ulong mem_malloc_brk; */ unsigned long mips_io_port_base = -1; +int __board_early_init_f(void) +{ + /* + * Nothing to do in this dummy implementation + */ + return 0; +} +int board_early_init_f(void) __attribute__((weak, alias("__board_early_init_f"))); + /* * The Malloc area is immediately below the monitor copy in DRAM */ @@ -167,6 +176,7 @@ static int init_baudrate (void) typedef int (init_fnc_t) (void); init_fnc_t *init_sequence[] = { + board_early_init_f, timer_init, env_init, /* initialize environment */ #ifdef CONFIG_INCA_IP -- 1.6.0.4

4 6

[U-Boot] Installing ELDK from arm-2006-09-06-uclibc.iso stuck at "1:glib2-devel-arm_trg" futex call on ubuntu 8.1
by Ajit Mittal 18 Nov '08

18 Nov '08

I also tried the file arm-2007-01-22-uclibc.iso. It also has same problem. Yes it fails on futex Process 22376 attached - interrupt to quit futex(0x8c811e4, 0x80 /* FUTEX_??? */, 1^C <unfinished ...> Thx In message <dfa7268c0811171403q1df75e38n90476d64822aaede(a)mail.gmail.com> you wrote: > I ma trying to instal ELDK for embedded arm xscale using the command POLease note that this posting is off topic here. You should post such requests on the ELDK mailing list instead. > install arm > > It hangs at: > "1:glib2-devel-arm_trg" on ubuntu 8.1 Please try to find out which process is hanging (most likely a "rpm" command). The run "strace -p" on the respective PID. Is the program hanging in a futex call? Best regards, Wolfgang Denk

2 1

[U-Boot] USB custodianship
by Markus Klotzbücher 18 Nov '08

18 Nov '08

Dear List, I've been maintaining the USB Layer in "bugfix mode" for some time now, but this piece of code really needs much more attention. There are definitely some brownie points to earn here: cleanup, increase of robustness, EHCI,... Unfortunately attention takes time, and I don't have much of that these days. I would therefore like to propse Remy Bohmer as a new USB custodian. Remy has done an excellent job in fixing bugs, doing cleanup and working with others to achieve this. I believe he is the right person for this job and will be able to work more effectively without suffering from my latencies. What does the community think? Best regards Markus Klotzbuecher -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office(a)denx.de")

4 6

Re: [U-Boot] U-Boot to load VxWorks
by raul.moreno＠telvent.com 18 Nov '08

18 Nov '08

Thank you for your answer, Niklaus! I have been looking at your mention files and boards. I will also use TFTP to download the VxWorks image and then the bootvx command like you do. However, just the first time. Later, the VxWorks must be saved in flash and after reseting , the board must boot automatically. Just in case we want to update VxWorks, we will use the TFTP again. My VxWorks image is just an elf binary format image. Could I boot this image with bootvx directly or do I have to use mkimage to convert this image to a understandable image for U-Boot? I mean, what kind of VxWorks image must I have? I am also not sure what parameters I have to add in the bootargs environment variable. Regards, Raúl Moreno Niklaus Giger <niklaus.giger(a)member.fsf.org> Niklaus Giger 17/11/2008 22:04 Para: raul.moreno(a)telvent.com cc: Asunto: Re: U-Boot to load VxWorks Ola RaÃºl Look at the include/configs/hcu4.h and include/configs/netstal-common.h how I handle booting vxWorks from a TFTP server. I use a TFTP-server wherefrom I download the vxWorks image. As far as I know vxWorks and u-boot don't have any common flash file system. Also U-boot only supports downloading via TFTP (UDP) and not via FTP (TCP/IP based). Saludos Niklaus raul.moreno(a)telvent.com wrote: > > Hello people, > > I am used to using U-boot in order to boot Linux, but now I also need to > boot VxWorks. > > Till now I copied the Linux kernel in Flash and when I wanted to update > it, I had two options: doing it from U-Boot (tftp the image and using the > cp command) or from Linux (using the dd command or flashcp). The kernel is > always in the same flash location, a determined address. So I have to > reserve enough memory in case the updating is bigger. > > With VxWorks, I works as follows: the bootloader mounts a filesystem in > flash where I can transfer through ftp the operating system, VxWorks. I > mean, I can see the operating system as a file. In Linux I don't have it, > but the operating system image is saved in flash from an address. I am not > sure if people who use VxWorks works like me or there are other options to > boot. The good with my option is that you can update the operating system > just changing the file with ftp. > > The thing is I would like to use the same U-Boot to boot both systems: > Linux and VxWorks. So I should have to have a similar way to boot. The > only difference will be the boot command: bootvx for VxWorks and bootm for > Linux. > > Could you explain me what the common way to use U-Boot with VxWorks is? > > I doubt a lot what is the best option: > - Tring to mount a filesystem with U-Boot that VxWorks also understands. > - Making like with Linux. I mean, copying the VxWorks from an determined > address. Then the VxWorks won't be seen as a file. > - Others not thought yet.... > > Is there documentation about VxWorks with U-Boot? > > I would thank you your help! > > Best regards, > > RaÃºl Moreno

1 0

[U-Boot] [PATCH] MIPS: Add CONFIG_SKIP_LOWLEVEL_INIT and flush dcache upon relocation
by Stefan Roese 18 Nov '08

18 Nov '08

This patch adds the CONFIG_SKIP_LOWLEVEL_INIT option to start.S. This enables support for boards where the lowlevel initialization is already done when U-Boot runs (e.g. via OnChip ROM). Also the data cache will be flushed upon relocation. This is missing in the current implementation. All this will be used in the upcoming VCTH board support. Signed-off-by: Stefan Roese <sr(a)denx.de> --- cpu/mips/start.S | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/cpu/mips/start.S b/cpu/mips/start.S index 6a22302..5b71b00 100644 --- a/cpu/mips/start.S +++ b/cpu/mips/start.S @@ -243,9 +243,11 @@ reset: mtc0 zero, CP0_COUNT mtc0 zero, CP0_COMPARE +#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) /* CONFIG0 register */ li t0, CONF_CM_UNCACHED mtc0 t0, CP0_CONFIG +#endif /* !CONFIG_SKIP_LOWLEVEL_INIT */ /* Initialize $gp. */ @@ -255,6 +257,7 @@ reset: 1: lw gp, 0(ra) +#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) /* Initialize any external memory. */ la t9, lowlevel_init @@ -271,6 +274,7 @@ reset: */ li t0, CONF_CM_CACHABLE_NONCOHERENT mtc0 t0, CP0_CONFIG +#endif /* !CONFIG_SKIP_LOWLEVEL_INIT */ /* Set up temporary stack. */ @@ -323,6 +327,14 @@ relocate_code: * t1 = target address * t2 = source end address */ + + /* + * Save destination address and size for later usage in flush_cache() + */ + move t7, a1 /* save gd in t7 */ + move a0, t1 /* a0 <-- destination addr */ + sub a1, t2, t0 /* a1 <-- size */ + /* On the purple board we copy the code earlier in a special way * in order to solve flash problems */ @@ -338,6 +350,11 @@ relocate_code: /* If caches were enabled, we would have to flush them here. */ + /* a0 & a1 are already set up for flush_cache(start, size) */ + la t9, flush_cache + jalr t9 + nop + /* Jump to where we've relocated ourselves. */ addi t0, a2, in_ram - _start @@ -387,7 +404,7 @@ in_ram: bltl t1, t2, 1b sw zero, 0(t1) /* delay slot */ - move a0, a1 + move a0, t7 /* a0 <-- gd */ la t9, board_init_r jr t9 move a1, a2 /* delay slot */ -- 1.6.0.4

3 3

[U-Boot] Installing ELDK from arm-2006-09-06-uclibc.iso stuck at "1:glib2-devel-arm_trg" on ubuntu 8.1
by Ajit Mittal 18 Nov '08

18 Nov '08

I ma trying to instal ELDK for embedded arm xscale using the command install arm It hangs at: "1:glib2-devel-arm_trg" on ubuntu 8.1 Thanks

2 1

[U-Boot] Building tools without building firmware
by Matt Sealey 17 Nov '08

17 Nov '08

We have a need to build and package at the very least 'mkimage' for SuSE 11.1 and since we have multiple board targets in mind (MPC8641D, MPC8610, MPC5121e) it does not make any sense to pick any in particular or build the entire u-boot.bin just for a few kilobytes we need to prep kernels and initrd images. Is it possible to simply build the tools/ directory (a make target that works would be great) without building a firmware from BLAH_config first? -- Matt Sealey <matt(a)genesi-usa.com> Genesi, Manager, Developer Relations

2 5

[U-Boot] [PATCH] [ONENAND] Add markbad function
by Kyungmin Park 17 Nov '08

17 Nov '08

Add missing markbad function If not, it's hang when it entered the mtd->mard_bad(). It's not against the u-boot-nand. Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index a54098c..0dc99be 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -1589,6 +1589,37 @@ int onenand_block_isbad(struct mtd_info *mtd, loff_t ofs) } /** + * onenand_default_block_markbad - [DEFAULT] mark a block bad + * @param mtd MTD device structure + * @param ofs offset from device start + * + * This is the default implementation, which can be overridden by + * a hardware specific driver. + */ +static int onenand_default_block_markbad(struct mtd_info *mtd, loff_t ofs) +{ + struct onenand_chip *this = mtd->priv; + struct bbm_info *bbm = this->bbm; + u_char buf[2] = {0, 0}; + struct mtd_oob_ops ops = { + .mode = MTD_OOB_PLACE, + .ooblen = 2, + .oobbuf = buf, + .ooboffs = 0, + }; + int block; + + /* Get block number */ + block = ((int) ofs) >> bbm->bbt_erase_shift; + if (bbm->bbt) + bbm->bbt[block >> 2] |= 0x01 << ((block & 0x03) << 1); + + /* We write two bytes, so we dont have to mess with 16 bit access */ + ofs += mtd->oobsize + (bbm->badblockpos & ~0x01); + return onenand_write_oob_nolock(mtd, ofs, &ops); +} + +/** * onenand_block_markbad - [MTD Interface] Mark the block at the given offset as bad * @param mtd MTD device structure * @param ofs offset relative to mtd start @@ -2051,6 +2082,8 @@ int onenand_scan(struct mtd_info *mtd, int maxchips) if (!this->write_bufferram) this->write_bufferram = onenand_write_bufferram; + if (!this->block_markbad) + this->block_markbad = onenand_default_block_markbad; if (!this->scan_bbt) this->scan_bbt = onenand_default_bbt;

2 1