July 2008 - U-Boot

Re: [U-Boot-Users] eth interface (motfec) is not woring with u-boot1.1.3
by vijay vijay 23 Jul '08

23 Jul '08

Hi Ken,Wolfgang Thanks for the Reply I have updated the my configuration for the CONFIG_ETHADDR and CONFIG_IPADDR But still getting same "TX timeout" error. from function static int fec_send(struct eth_device* dev, volatile void *packet, int length) in defined in the cpu/mpc8xx/fec..c ----- while ((rtx->txbd[txIdx].cbd_sc & BD_ENET_TX_READY) && (j<TOUT_LOOP)) { #if defined(CONFIG_ICU862) udelay(10); #else udelay(100); #endif j++; } if (j>=TOUT_LOOP) { printf("TX timeout..testing.\n"); } ----- When I am running VxWorks on the same board LEDs at RJ45 connector ( Ethernet interfaces) on the board are glowing but when u-boot is up these LED are off. It seems that ETH interface is not up yet. Which board can be used as the reference board for the MPC870. Thanks Vijay ----- Original Message ---- From: Wolfgang Denk <wd(a)denx.de> To: Ken.Fuchs(a)bench.com Cc: vijays2010(a)yahoo.co.in; u-boot-users@lists..sourceforge.net Sent: Tuesday, 22 July, 2008 1:48:21 AM Subject: Re: [U-Boot-Users] eth interface (motfec) is not woring with u-boot1.1.3 In message <AA28F077645B324881335614E4F7C4284A49AA(a)win-ex01.bench.com> you wrote: > > > And of course even 00:11:22:33:44:55 is not a legal MAC address and > > MUST NOT BE USED. Please see the FAQ. > > Actually, 00:11:22:33:44:55 is a perfectly legal (universally > administered) MAC address: You are of course right - I was too terse. Thanks for adding the missing details. > No doubt this is what you were referring to when you said > "00:11:22:33:44:55 is not a legal MAC address". A better, > easy to remember locally administered MAC address would be > 02:03:04:05:06:07. ACK - or use tools/genethaddr to generate a random locally administered MAC address. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de "Ada is PL/I trying to be Smalltalk. - Codoso diBlini Explore your hobbies and interests. Go to http://in.promos.yahoo.com/groups/

2 1

[U-Boot-Users] [PATCH] Added support to flash_real_protect for Atmel flash devices (tested with AT49BV6416)
by Rafael Campos 23 Jul '08

23 Jul '08

Most of the ATMEL flash starts in read-only mode. We need to unprotect it. Signed-off-by: Rafael Campos Las Heras <rafael.campos(a)hanscan.com> --- drivers/mtd/cfi_flash.c | 40 ++++++++++++++++++++++++++++++++++------ 1 files changed, 34 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 4340b1b..8d12eb8 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -103,6 +103,10 @@ #define AMD_STATUS_TOGGLE 0x40 #define AMD_STATUS_ERROR 0x20 +#define ATM_CMD_UNLOCK_SECT 0x70 +#define ATM_CMD_SOFTLOCK_START 0x80 +#define ATM_CMD_LOCK_SECT 0x40 + #define FLASH_OFFSET_MANUFACTURER_ID 0x00 #define FLASH_OFFSET_DEVICE_ID 0x01 #define FLASH_OFFSET_DEVICE_ID2 0x0E @@ -1348,12 +1352,36 @@ int flash_real_protect (flash_info_t * info, long sector, int prot) { int retcode = 0; - flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS); - flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT); - if (prot) - flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_SET); - else - flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_CLEAR); + switch (info->vendor) { + case CFI_CMDSET_INTEL_PROG_REGIONS: + case CFI_CMDSET_INTEL_STANDARD: + flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS); + flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT); + if (prot) + flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_SET); + else + flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_CLEAR); + break; + case CFI_CMDSET_AMD_EXTENDED: + case CFI_CMDSET_AMD_STANDARD: +#ifdef CONFIG_FLASH_CFI_LEGACY + case CFI_CMDSET_AMD_LEGACY: +#endif + /* U-Boot only checks the first byte */ + if (info->manufacturer_id == (uchar)ATM_MANUFACT ) { + if (prot) { + flash_unlock_seq(info, 0); + flash_write_cmd (info, 0, info->addr_unlock1, ATM_CMD_SOFTLOCK_START); + flash_unlock_seq(info, 0); + flash_write_cmd (info, sector, 0, ATM_CMD_LOCK_SECT); + } else { + flash_write_cmd (info, 0, info->addr_unlock1, AMD_CMD_UNLOCK_START); + if (info->device_id == ATM_ID_BV6416) + flash_write_cmd (info, sector, 0, ATM_CMD_UNLOCK_SECT); + } + } + break; + } if ((retcode = flash_full_status_check (info, sector, info->erase_blk_tout, -- 1.5.6.2

1 0

[U-Boot-Users] [PATCH 1/4] avr32: asm/io.h needs asm/types.h
by Haavard Skinnemoen 23 Jul '08

23 Jul '08

map_physmem() takes a phys_addr_t as parameter. This type is defined in asm/types.h, so we need to include that file. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen(a)atmel.com> --- include/asm-avr32/io.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/asm-avr32/io.h b/include/asm-avr32/io.h index d030c26..06e52b1 100644 --- a/include/asm-avr32/io.h +++ b/include/asm-avr32/io.h @@ -22,6 +22,8 @@ #ifndef __ASM_AVR32_IO_H #define __ASM_AVR32_IO_H +#include <asm/types.h> + #ifdef __KERNEL__ /* -- 1.5.6.2

1 3

[U-Boot-Users] Calling a kernel from a mini-bootloader
by Guillaume Dargaud 23 Jul '08

23 Jul '08

Hello all, this question is a bit off-topic since I looked at using U-Boot but eventually wrote a simpler bootloader myself. Anyway, my experience with bootloader is limited to say the least. The direct questions are at the end of this lengthy post (sorry), but here's some background first: I have a working Linux kernel and a working bootloader... but not when the latter calls the former. Case in point: - load zImage.elf to DRAM 0x400000 with JTAG debugger. Run it. It runs fine. - Load Bootloader.elf to BRAM 0xFFFF0000 with JTAG debugger. Run it. It runs fine (but it doesn't do much yet). - Now load both of the previous ones, and have the bootloader perform a jump to kernel: void main() { typedef void tFunc(void); ((tFunc *)0x400000)(); } Now if the bootloader _only_ contains the above code, the kernel runs perfectly. Unfortunately I need to do some things in the bootloader: I use 6 GPIOs to control, among other things, a frontal set of LEDs, a card ID number and a serial flash memory. Those operations work. But here is the strange thing that leads me to believe there are interrupt 'interferences'. If I just read from a GPIO before launching the kernel, it boots fine, with a few NFS errors when mounting the rootnfs: [ 4.360060] Freeing unused kernel memory: 76k init [ 11.432269] nfs: server 192.168.1.185 not responding, still trying [ 11.441186] nfs: server 192.168.1.185 OK init started: BusyBox v1.10.1 (2008-04-24 12:26:38 CEST) genepy login: Now if I also write to a 2nd GPIO, I get a lot more NFS errors. And if I also access the flash through the 3rd GPIO, the kernel hangs: > loaded at: 00400000 004EA19C > board data at: 004E8120 004E819C > relocated to: 0040405C 004040D8 > zimage at: 00404E48 004E7A7E > avail ram: 004EB000 08000000 > > Linux/PPC load: console=ttyUL0,115200 rw root=/dev/nfs ip=bootp > Uncompressing Linux...done. > Now booting the kernel But then it hangs for exactly 3 minutes, nothing on the serial port, before the bootloader restarts. Why should the behavior be different whether it's started from the debugger or from my bootloader ? Now I've defined my hardware project [based on Xilinx ML405 card architecture] using interrupts on the GPIOs, which I don't need and frankly they don't make sense for an output GPIO. I would like to try to compile a kernel without GPIO interrupts, unfortunately the compilation fails: $ make ARCH=ppc CROSS_COMPILE=powerpc-linux-uclibc- [...] CC arch/ppc/syslib/virtex_devices.o arch/ppc/syslib/virtex_devices.c:535: error: 'XPAR_INTC_0_GPIO_0_VEC_ID' undeclared here (not in a function) Question breakdown: - do I need interrupts for GPIOs ? - how can I compile the ppc 2.6.25 kernel without them ? - Why do I have problems running the kernel if the bootloader makes use of the GPIOs ? - does the bootloader need to perform some kind of special cleanup before calling the kernel ? Thanks a lot for shedding a light on those mysteries. -- Guillaume Dargaud http://www.gdargaud.net/ "Programming is like sex: one mistake and you're providing support for a lifetime." - Michael Sinz.

1 0

[U-Boot-Users] imx31 litekit
by Nathan Manning 23 Jul '08

23 Jul '08

Hello, My name is Nathan. I'm new to u-boot, but you may have recently seen a post asking for imx31 litekit help. I've received some really good help from other mx31ads or mx31pdk users, but haven't heard from anyone using the litekit. Is there anyone out there with specific knowledge of the eval board I'm working with? Sincerely, Nathan

1 0

[U-Boot-Users] amcc glacier board ethernet does not work?
by vb 22 Jul '08

22 Jul '08

I have an amcc glacier eval board, which came with u-boot installed, with working ethernet. The amcc folks told me that the u-boot was built off the denx 1.3.3 repository, so I cloned git://git.denx.de/u-boot.git and built glacier. It comes up all right, but reports Net: No ethernet found. along the way. The I tried cloning git://www.denx.de/git/u-boot-ppc4xx.git and building it from there - the same result, no ethernet interface up. Does anyone know if this is something to expect, or has something gone wrong? TIA, vadim

1 1

[U-Boot-Users] Linux not booting and jffs2 FS not mounting
by Vijay Nikam 22 Jul '08

22 Jul '08

Hello All, I have mpc8313erdb evaluation board ... now I am trying to boot it from NAND Flash (32MB Flash) ... I am able to get u-boot prompt ... but the linux kernel is not booting and so filesystem is not mounting ... It says : No filesystem could mount root, Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(1,0) Rebooting in 180 seconds what is going wrong ? ? ? Please acknowledge ... thank you ... Kind Regards, Vijay Nikam

2 1

Re: [U-Boot-Users] [PATCH]: Fix for bug: U-boot environment corrupt by reading uninitialized flash memory instead of RAM.
by Wolfgang Denk 22 Jul '08

22 Jul '08

In message <005801c8c0f0$2baed020$830c7060$@Tjernlund@transmode.se> you wrote: > > > > > If you do not like the way it is fixed, then remove git-commit > > > > c0559be371b2a64b1a817088c3308688e2182f93 which causes this regression > > > > for the time being, to buy more time to fix it in a different/better > > > > way for the next release. Now with this commit the complete at91-board > > > > series (boards that boot from dataflash or nandflash) are broken. > > > > So,we have a serious regression here. > > > > > > That's what I did now: I reverted commit c0559be3. > > > > > > Joakim, please re-submit after the problems were understood and fixed. > > > > You want me to resubmit something I got no control over? That won't > > happen and I doubt the problem boards will care either so I guess > > this improvement is lost. > > > > Jocke > > Has the problem boards been fixed yet? If so please resubmit commit c0559be3. So what *is* the state of this? If nobody responds soon, I will indeed re-apply that patch, andthen I will not revert this commit again. So if you think this bytes you, please speak up *now*. Jock, would you please send me a reminder in a week or so? Thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de Hindsight is an exact science.

3 6

[U-Boot-Users] [PATCH] Fix bug: `env_get_char' dose not work well on u-boot-1.3.4-rc1
by os user 22 Jul '08

22 Jul '08

Hi folks, I use Atmel AT91SAM9260-EK boards, arm-linux-gcc (GCC) 4.2.4. After I pulled the latest code from git://git.denx.de/u-boot-at91.git, I found that the env_get_char(a)common/env_common.c can not work well. The root cause is in u-boot-1.3.4-rc1, `env_get_char' was rewritten. Below is a quick patch to kick the ball rolling. Thanks! >From 2a1462f7df8aee397fcd1d891c71ea212e1a9f5a Mon Sep 17 00:00:00 2001 From: gnusercn <gnusercn(a)gmail.com> Date: Tue, 22 Jul 2008 10:35:58 +0800 Subject: [PATCH] Fix bug: in arch-arm, env_get_char dose not work fine in u-boot 1.3.4-rc1 Signed-off-by: gnusercn <gnusercn(a)gmail.com> --- lib_arm/board.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/lib_arm/board.c b/lib_arm/board.c index 80b149b..cd8c9f3 100644 --- a/lib_arm/board.c +++ b/lib_arm/board.c @@ -303,6 +303,8 @@ void start_armboot (void) gd->bd = (bd_t*)((char*)gd - sizeof(bd_t)); memset (gd->bd, 0, sizeof (bd_t)); + gd->flags |= GD_FLG_RELOC; + monitor_flash_len = _bss_start - _armboot_start; for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) { -- 1.5.0.6

2 1

[U-Boot-Users] [PATCH] JFFS2 command support on OneNAND
by Kyungmin Park 22 Jul '08

22 Jul '08

JFFS2 command support on OneNAND Next time it will be more optimized and clean-up. Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c index 1b67e73..959306f 100644 --- a/common/cmd_jffs2.c +++ b/common/cmd_jffs2.c @@ -51,7 +51,7 @@ * mtdids=<idmap>[,<idmap>,...] * * <idmap> := <dev-id>=<mtd-id> - * <dev-id> := 'nand'|'nor'<dev-num> + * <dev-id> := 'nand'|'nor'|'onenand'<dev-num> * <dev-num> := mtd device number, 0... * <mtd-id> := unique device tag used by linux kernel to find mtd device (mtd->name) * @@ -103,6 +103,13 @@ #include <nand.h> #endif /* !CFG_NAND_LEGACY */ #endif + +#if defined(CONFIG_CMD_ONENAND) +#include <linux/mtd/mtd.h> +#include <linux/mtd/onenand.h> +#include <onenand_uboot.h> +#endif + /* enable/disable debugging messages */ #define DEBUG_JFFS #undef DEBUG_JFFS @@ -401,6 +408,43 @@ static int part_validate_nand(struct mtdids *id, struct part_info *part) } /** + * Performs sanity check for supplied OneNAND flash partition. + * Table of existing OneNAND flash devices is searched and partition device + * is located. Alignment with the granularity of nand erasesize is verified. + * + * @param id of the parent device + * @param part partition to validate + * @return 0 if partition is valid, 1 otherwise + */ +static int part_validate_onenand(struct mtdids *id, struct part_info *part) +{ +#if defined(CONFIG_CMD_ONENAND) + /* info for OneNAND chips */ + struct mtd_info *mtd; + + mtd = &onenand_mtd; + + if ((unsigned long)(part->offset) % mtd->erasesize) { + printf("%s%d: partition (%s) start offset" + "alignment incorrect\n", + MTD_DEV_TYPE(id->type), id->num, part->name); + return 1; + } + + if (part->size % mtd->erasesize) { + printf("%s%d: partition (%s) size alignment incorrect\n", + MTD_DEV_TYPE(id->type), id->num, part->name); + return 1; + } + + return 0; +#else + return 1; +#endif +} + + +/** * Performs sanity check for supplied partition. Offset and size are verified * to be within valid range. Partition type is checked and either * parts_validate_nor() or parts_validate_nand() is called with the argument @@ -436,6 +480,8 @@ static int part_validate(struct mtdids *id, struct part_info *part) return part_validate_nand(id, part); else if (id->type == MTD_DEV_TYPE_NOR) return part_validate_nor(id, part); + else if (id->type == MTD_DEV_TYPE_ONENAND) + return part_validate_onenand(id, part); else DEBUGF("part_validate: invalid dev type\n"); @@ -755,7 +801,15 @@ static int device_validate(u8 type, u8 num, u32 *size) #else printf("support for NAND devices not present\n"); #endif - } + } else if (type == MTD_DEV_TYPE_ONENAND) { +#if defined(CONFIG_CMD_ONENAND) + *size = onenand_mtd.size; + return 0; +#else + printf("support for OneNAND devices not present\n"); +#endif + } else + printf("Unknown defice type %d\n", type); return 1; } @@ -1065,8 +1119,8 @@ static struct mtdids* id_find_by_mtd_id(const char *mtd_id, unsigned int mtd_id_ #endif /* #ifdef CONFIG_JFFS2_CMDLINE */ /** - * Parse device id string <dev-id> := 'nand'|'nor'<dev-num>, return device - * type and number. + * Parse device id string <dev-id> := 'nand'|'nor'|'onenand'<dev-num>, + * return device type and number. * * @param id string describing device id * @param ret_id output pointer to next char after parse completes (output) @@ -1085,6 +1139,9 @@ int id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num) } else if (strncmp(p, "nor", 3) == 0) { *dev_type = MTD_DEV_TYPE_NOR; p += 3; + } else if (strncmp(p, "onenand", 7) == 0) { + *dev_type = MTD_DEV_TYPE_ONENAND; + p += 7; } else { printf("incorrect device type in %s\n", id); return 1; @@ -1489,7 +1546,7 @@ static int parse_mtdids(const char *const ids) while(p && (*p != '\0')) { ret = 1; - /* parse 'nor'|'nand'<dev-num> */ + /* parse 'nor'|'nand'|'onenand'<dev-num> */ if (id_parse(p, &p, &type, &num) != 0) break; diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index d1423c1..88b8f64 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -271,6 +271,107 @@ static void put_fl_mem_nand(void *buf) } #endif +#if defined(CONFIG_CMD_ONENAND) + +#include <linux/mtd/mtd.h> +#include <linux/mtd/onenand.h> +#include <onenand_uboot.h> + +#define ONENAND_PAGE_SIZE 2048 +#define ONENAND_PAGE_SHIFT 11 +#define ONENAND_PAGE_MASK (~(ONENAND_PAGE_SIZE-1)) + +#ifndef ONENAND_CACHE_PAGES +#define ONENAND_CACHE_PAGES 4 +#endif +#define ONENAND_CACHE_SIZE (ONENAND_CACHE_PAGES*ONENAND_PAGE_SIZE) + +static u8* onenand_cache; +static u32 onenand_cache_off = (u32)-1; + +static int read_onenand_cached(u32 off, u32 size, u_char *buf) +{ + u32 bytes_read = 0; + size_t retlen; + int cpy_bytes; + + while (bytes_read < size) { + if ((off + bytes_read < onenand_cache_off) || + (off + bytes_read >= onenand_cache_off + ONENAND_CACHE_SIZE)) { + onenand_cache_off = (off + bytes_read) & ONENAND_PAGE_MASK; + if (!onenand_cache) { + /* This memory never gets freed but 'cause + it's a bootloader, nobody cares */ + onenand_cache = malloc(ONENAND_CACHE_SIZE); + if (!onenand_cache) { + printf("read_onenand_cached: can't alloc cache size %d bytes\n", + ONENAND_CACHE_SIZE); + return -1; + } + } + + retlen = ONENAND_CACHE_SIZE; + if (onenand_read(&onenand_mtd, onenand_cache_off, retlen, + &retlen, onenand_cache) != 0 || + retlen != ONENAND_CACHE_SIZE) { + printf("read_onenand_cached: error reading nand off %#x size %d bytes\n", + onenand_cache_off, ONENAND_CACHE_SIZE); + return -1; + } + } + cpy_bytes = onenand_cache_off + ONENAND_CACHE_SIZE - (off + bytes_read); + if (cpy_bytes > size - bytes_read) + cpy_bytes = size - bytes_read; + memcpy(buf + bytes_read, + onenand_cache + off + bytes_read - onenand_cache_off, + cpy_bytes); + bytes_read += cpy_bytes; + } + return bytes_read; +} + +static void *get_fl_mem_onenand(u32 off, u32 size, void *ext_buf) +{ + u_char *buf = ext_buf ? (u_char *)ext_buf : (u_char *)malloc(size); + + if (NULL == buf) { + printf("get_fl_mem_onenand: can't alloc %d bytes\n", size); + return NULL; + } + if (read_onenand_cached(off, size, buf) < 0) { + if (!ext_buf) + free(buf); + return NULL; + } + + return buf; +} + +static void *get_node_mem_onenand(u32 off) +{ + struct jffs2_unknown_node node; + void *ret = NULL; + + if (NULL == get_fl_mem_onenand(off, sizeof(node), &node)) + return NULL; + + ret = get_fl_mem_onenand(off, node.magic == + JFFS2_MAGIC_BITMASK ? node.totlen : sizeof(node), + NULL); + if (!ret) { + printf("off = %#x magic %#x type %#x node.totlen = %d\n", + off, node.magic, node.nodetype, node.totlen); + } + return ret; +} + + +static void put_fl_mem_onenand(void *buf) +{ + free(buf); +} +#endif + #if defined(CONFIG_CMD_FLASH) /* @@ -316,6 +417,11 @@ static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf) return get_fl_mem_nand(off, size, ext_buf); #endif +#if defined(CONFIG_CMD_ONENAND) + if (id->type == MTD_DEV_TYPE_ONENAND) + return get_fl_mem_onenand(off, size, ext_buf); +#endif + printf("get_fl_mem: unknown device type, using raw offset!\n"); return (void*)off; } @@ -335,6 +441,11 @@ static inline void *get_node_mem(u32 off) return get_node_mem_nand(off); #endif +#if defined(CONFIG_CMD_ONENAND) + if (id->type == MTD_DEV_TYPE_ONENAND) + return get_node_mem_onenand(off); +#endif + printf("get_node_mem: unknown device type, using raw offset!\n"); return (void*)off; } @@ -348,6 +459,13 @@ static inline void put_fl_mem(void *buf) if (id->type == MTD_DEV_TYPE_NAND) return put_fl_mem_nand(buf); #endif + +#if defined(CONFIG_CMD_ONENAND) + struct mtdids *id = current_part->dev->id; + + if (id->type == MTD_DEV_TYPE_ONENAND) + return put_fl_mem_onenand(buf); +#endif } /* Compression names */ diff --git a/include/jffs2/load_kernel.h b/include/jffs2/load_kernel.h index 882a80e..b46eca3 100644 --- a/include/jffs2/load_kernel.h +++ b/include/jffs2/load_kernel.h @@ -28,9 +28,14 @@ #include <linux/list.h> /* mtd device types */ -#define MTD_DEV_TYPE_NOR 0x0001 -#define MTD_DEV_TYPE_NAND 0x0002 -#define MTD_DEV_TYPE(type) ((type == MTD_DEV_TYPE_NAND) ? "nand" : "nor") +enum { + MTD_DEV_TYPE_NOR, + MTD_DEV_TYPE_NAND, + MTD_DEV_TYPE_ONENAND, +}; + +#define MTD_DEV_TYPE(type) ((type == MTD_DEV_TYPE_NAND) ? "nand" : \ + (type == MTD_DEV_TYPE_ONENAND) ? "onenand" : "nor") struct mtd_device { struct list_head link; diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h index 4b0c2df..5bc905e 100644 --- a/include/linux/mtd/onenand.h +++ b/include/linux/mtd/onenand.h @@ -17,6 +17,7 @@ /* Note: The header order is impoertant */ #include <onenand_uboot.h> +#include <linux/mtd/compat.h> #include <linux/mtd/bbm.h> #define MAX_BUFFERRAM 2 diff --git a/include/onenand_uboot.h b/include/onenand_uboot.h index 4449f98..24ace2a 100644 --- a/include/onenand_uboot.h +++ b/include/onenand_uboot.h @@ -27,6 +27,8 @@ typedef int wait_queue_head_t; struct mtd_info; struct erase_info; +extern struct mtd_info onenand_mtd; + /* Functions */ extern void onenand_init(void); extern int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,

4 6