November 2008 - U-Boot

Re: [U-Boot] [PATCH] FAT on non standard sector size devices
by Igor Luri 17 Nov '08

17 Nov '08

Dear Remy Bohme, Sorry, but I don't have experience in email encoding. I have changed Evolution's preferences to use ISO-8859-15 intead of UTF-8 caracter encoding. If this change does not correct the problem, any help would be apretiated. Thanks. Signed-off-by: Igor Luri <iluri(a)aotek.es> diff --git a/include/fat.h b/include/fat.h index 59de3fb..dad2e3d 100644 --- a/include/fat.h +++ b/include/fat.h @@ -31,20 +31,12 @@ #define CONFIG_SUPPORT_VFAT -#define SECTOR_SIZE FS_BLOCK_SIZE - -#define FS_BLOCK_SIZE 512 - -#if FS_BLOCK_SIZE != SECTOR_SIZE -#error FS_BLOCK_SIZE != SECTOR_SIZE - This code needs to be fixed! -#endif - #define MAX_CLUSTSIZE 65536 -#define DIRENTSPERBLOCK (FS_BLOCK_SIZE/sizeof(dir_entry)) -#define DIRENTSPERCLUST ((mydata->clust_size*SECTOR_SIZE)/sizeof(dir_entry)) +#define DIRENTSPERBLOCK (mydata->sector_size/sizeof(dir_entry)) +#define DIRENTSPERCLUST ((mydata->clust_size*mydata->sector_size)/sizeof(dir_entry)) #define FATBUFBLOCKS 6 -#define FATBUFSIZE (FS_BLOCK_SIZE*FATBUFBLOCKS) +#define FATBUFSIZE (mydata->sector_size*FATBUFBLOCKS) #define FAT12BUFSIZE ((FATBUFSIZE*2)/3) #define FAT16BUFSIZE (FATBUFSIZE/2) #define FAT32BUFSIZE (FATBUFSIZE/4) @@ -182,8 +174,9 @@ typedef struct dir_slot { * (see FAT32 accesses) */ typedef struct { - __u8 fatbuf[FATBUFSIZE]; /* Current FAT buffer */ + __u8 *fatbuf; /* Current FAT buffer */ int fatsize; /* Size of FAT in bits */ + __u16 sector_size; /* Sector size */ __u16 fatlength; /* Length of FAT in sectors */ __u16 fat_sect; /* Starting sector of the FAT */ __u16 rootdir_sect; /* Start sector of root directory */ diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 2f0bd8c..c24f009 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -30,6 +30,7 @@ #include <fat.h> #include <asm/byteorder.h> #include <part.h> +#include <malloc.h> /* * Convert a string to lowercase. @@ -67,12 +68,17 @@ int disk_read (__u32 startblock, __u32 getsize, __u8 * bufptr) int fat_register_device(block_dev_desc_t *dev_desc, int part_no) { - unsigned char buffer[SECTOR_SIZE]; + unsigned char *buffer; disk_partition_t info; if (!dev_desc->block_read) return -1; - cur_dev = dev_desc; + cur_dev=dev_desc; + + buffer = malloc (cur_dev->blksz); + if(buffer == NULL) + return(-1); + /* check if we have a MBR (on floppies we have only a PBR) */ if (dev_desc->block_read (dev_desc->dev, 0, 1, (ulong *) buffer) != 1) { printf ("** Can't read from device %d **\n", dev_desc->dev); @@ -118,6 +124,7 @@ fat_register_device(block_dev_desc_t *dev_desc, int part_no) cur_part = 1; } #endif + free(buffer); return 0; } @@ -220,12 +227,12 @@ get_fatent(fsdata *mydata, __u32 entry) /* Read a new block of FAT entries into the cache. */ if (bufnum != mydata->fatbufnum) { - int getsize = FATBUFSIZE/FS_BLOCK_SIZE; + int getsize = FATBUFSIZE/mydata->sector_size; __u8 *bufptr = mydata->fatbuf; __u32 fatlength = mydata->fatlength; __u32 startblock = bufnum * FATBUFBLOCKS; - fatlength *= SECTOR_SIZE; /* We want it in bytes now */ + fatlength *= mydata->sector_size; /* We want it in bytes now */ startblock += mydata->fat_sect; /* Offset from start of disk */ if (getsize > fatlength) getsize = fatlength; @@ -300,20 +307,25 @@ get_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, unsigned long size) } FAT_DPRINT("gc - clustnum: %d, startsect: %d\n", clustnum, startsect); - if (disk_read(startsect, size/FS_BLOCK_SIZE , buffer) < 0) { + if (disk_read(startsect, size/mydata->sector_size , buffer) < 0) { FAT_DPRINT("Error reading data\n"); return -1; } - if(size % FS_BLOCK_SIZE) { - __u8 tmpbuf[FS_BLOCK_SIZE]; - idx= size/FS_BLOCK_SIZE; + if(size % mydata->sector_size) { + __u8 * tmpbuf; + + tmpbuf = (__u8*) malloc(mydata->sector_size); + if(tmpbuf == NULL) + return(-1); + idx= size/mydata->sector_size; if (disk_read(startsect + idx, 1, tmpbuf) < 0) { FAT_DPRINT("Error reading data\n"); return -1; } - buffer += idx*FS_BLOCK_SIZE; + buffer += idx*mydata->sector_size; - memcpy(buffer, tmpbuf, size % FS_BLOCK_SIZE); + memcpy(buffer, tmpbuf, size % mydata->sector_size); + free(tmpbuf); return 0; } @@ -331,7 +343,7 @@ get_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer, unsigned long maxsize) { unsigned long filesize = FAT2CPU32(dentptr->size), gotsize = 0; - unsigned int bytesperclust = mydata->clust_size * SECTOR_SIZE; + unsigned int bytesperclust = mydata->clust_size * mydata->sector_size; __u32 curclust = START(dentptr); __u32 endclust, newclust; unsigned long actsize; @@ -440,7 +452,7 @@ get_vfatname(fsdata *mydata, int curclust, __u8 *cluster, { dir_entry *realdent; dir_slot *slotptr = (dir_slot*) retdent; - __u8 *nextclust = cluster + mydata->clust_size * SECTOR_SIZE; + __u8 *nextclust = cluster + mydata->clust_size * mydata->sector_size; __u8 counter = (slotptr->id & ~LAST_LONG_ENTRY_MASK) & 0xff; int idx = 0; @@ -463,7 +475,7 @@ get_vfatname(fsdata *mydata, int curclust, __u8 *cluster, return -1; } if (get_cluster(mydata, curclust, get_vfatname_block, - mydata->clust_size * SECTOR_SIZE) != 0) { + mydata->clust_size * mydata->sector_size) != 0) { FAT_DPRINT("Error: reading directory block\n"); return -1; } @@ -534,7 +546,7 @@ static dir_entry *get_dentfromdir (fsdata * mydata, int startsect, int i; if (get_cluster (mydata, curclust, get_dentfromdir_block, - mydata->clust_size * SECTOR_SIZE) != 0) { + mydata->clust_size * mydata->sector_size) != 0) { FAT_DPRINT ("Error: reading directory block\n"); return NULL; } @@ -667,9 +679,16 @@ static dir_entry *get_dentfromdir (fsdata * mydata, int startsect, static int read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize) { - __u8 block[FS_BLOCK_SIZE]; + __u8 *block; volume_info *vistart; + if(cur_dev == NULL) + return(-1); + + block = (__u8 *)malloc (cur_dev->blksz); + if(block == NULL) + return(-1); + if (disk_read(0, 1, block) < 0) { FAT_DPRINT("Error: reading block\n"); return -1; @@ -680,6 +699,7 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize) bs->fat_length = FAT2CPU16(bs->fat_length); bs->secs_track = FAT2CPU16(bs->secs_track); bs->heads = FAT2CPU16(bs->heads); + *(__u16 *)bs->sector_size = FAT2CPU16(*(__u16 *)bs->sector_size); #if 0 /* UNUSED */ bs->hidden = FAT2CPU32(bs->hidden); #endif @@ -704,7 +724,7 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize) /* Terminate fs_type string. Writing past the end of vistart is ok - it's just the buffer. */ vistart->fs_type[8] = '\0'; - + free(block); if (*fatsize == 32) { if (compare_sign(FAT32_SIGN, vistart->fs_type) == 0) { return 0; @@ -757,6 +777,7 @@ do_fat_read (const char *filename, void *buffer, unsigned long maxsize, mydata->fatlength = bs.fat_length; } mydata->fat_sect = bs.reserved; + mydata->sector_size = *(__u16 *)bs.sector_size; cursect = mydata->rootdir_sect = mydata->fat_sect + mydata->fatlength * bs.fats; mydata->clust_size = bs.cluster_size; @@ -766,17 +787,20 @@ do_fat_read (const char *filename, void *buffer, unsigned long maxsize, - (mydata->clust_size * 2); } else { rootdir_size = ((bs.dir_entries[1] * (int) 256 + bs.dir_entries[0]) - * sizeof (dir_entry)) / SECTOR_SIZE; + * sizeof (dir_entry)) / mydata->sector_size; mydata->data_begin = mydata->rootdir_sect + rootdir_size - (mydata->clust_size * 2); } mydata->fatbufnum = -1; + mydata->fatbuf = (__u8 *) malloc (FATBUFSIZE); + if(mydata->fatbuf == NULL) + return(-1); FAT_DPRINT ("FAT%d, fatlength: %d\n", mydata->fatsize, mydata->fatlength); FAT_DPRINT ("Rootdir begins at sector: %d, offset: %x, size: %d\n" "Data begins at: %d\n", - mydata->rootdir_sect, mydata->rootdir_sect * SECTOR_SIZE, + mydata->rootdir_sect, mydata->rootdir_sect * mydata->sector_size, rootdir_size, mydata->data_begin); FAT_DPRINT ("Cluster size: %d\n", mydata->clust_size); @@ -787,8 +811,10 @@ do_fat_read (const char *filename, void *buffer, unsigned long maxsize, strcpy (fnamecopy, filename); downcase (fnamecopy); if (*fnamecopy == '\0') { - if (!dols) - return -1; + if (!dols) { + free(mydata->fatbuf); + return -1; + } dols = LS_ROOT; } else if ((idx = dirdelim (fnamecopy)) >= 0) { isdir = 1; @@ -806,6 +832,7 @@ do_fat_read (const char *filename, void *buffer, unsigned long maxsize, if (disk_read (cursect, mydata->clust_size, do_fat_read_block) < 0) { FAT_DPRINT ("Error: reading rootdir block\n"); + free(mydata->fatbuf); return -1; } dentptr = (dir_entry *) do_fat_read_block; @@ -856,6 +883,7 @@ do_fat_read (const char *filename, void *buffer, unsigned long maxsize, continue; } } else if (dentptr->name[0] == 0) { + free(mydata->fatbuf); FAT_DPRINT ("RootDentname == NULL - %d\n", i); if (dols == LS_ROOT) { printf ("\n%d file(s), %d dir(s)\n\n", files, dirs); @@ -906,9 +934,10 @@ do_fat_read (const char *filename, void *buffer, unsigned long maxsize, dentptr++; continue; } - if (isdir && !(dentptr->attr & ATTR_DIR)) + if (isdir && !(dentptr->attr & ATTR_DIR)) { + free(mydata->fatbuf); return -1; - + } FAT_DPRINT ("RootName: %s", s_name); FAT_DPRINT (", start: 0x%x", START (dentptr)); FAT_DPRINT (", size: 0x%x %s\n", @@ -949,20 +978,23 @@ do_fat_read (const char *filename, void *buffer, unsigned long maxsize, if (get_dentfromdir (mydata, startsect, subname, dentptr, isdir ? 0 : dols) == NULL) { + free(mydata->fatbuf); if (dols && !isdir) return 0; return -1; } if (idx >= 0) { - if (!(dentptr->attr & ATTR_DIR)) - return -1; + if (!(dentptr->attr & ATTR_DIR)) { + free(mydata->fatbuf); + return -1; + } subname = nextname; } } ret = get_contents (mydata, dentptr, buffer, maxsize); FAT_DPRINT ("Size: %d, got: %ld\n", FAT2CPU32 (dentptr->size), ret); - + free(mydata->fatbuf); return ret; } -- Igor Luri R&D Software Department Fagor Aotek S. Coop. P. O. Box 144 E-20500 Mondragón-Arrasate Tel. ++34 943 71 92 00 ++34 943 71 92 01 (Ext. 44268) Fax. ++34 943 79 92 03 www.aotek.es

3 3

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

17 Nov '08

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 ***********Internet Email Confidentiality Footer************* This email and any files transmitted with it are confidential and intended solely for the use of the organization or individual to whom they are addressed. It is expressly forbidden to retransmit or copy email and/or this attached files without our permission . If you are not the addressee indicated in this message (or responsible for delivery of the message to such person), you may not copy or deliver this message to anyone. In such case, you should destroy this message and kindly notify the sender by reply email. Please advise immediately if you or your employer does not consent to Internet email for messages of this kind. Opinions, conclusions and other information in this message that do not relate to the official business of my firm shall be understood as neither given nor endorsed by it.

1 0

[U-Boot] MMU initialization
by A. Geisreiter 17 Nov '08

17 Nov '08

Hello, I use U-Boot with a Marvell PXA270 CPU. And I have built a new Windows Embedded CE 6.0 Image with a given BSP for the board. In the end I get a binary Image with a virtual start address. This means to me, that the MMU must be initialized of the bootloader. But I think this should be the task of the kernel. So my question is: Is it possible to initialize the MMU with U-Boot at all? And how can I do this? Thank you, Andreas ______________________________________________________________ Andreas Geisreiter Entwicklung DH electronics GmbH - Am Anger 8 - 83346 Bergen - Germany HRB Traunstein 9602 - Ust ID Nr.: DE 174 205 805 Geschäftsführung Dipl.-Ing. Stefan Daxenberger, Dipl.-Ing. Helmut Henschke Email: mailto:ageisreiter@dh-electronics.de Web: www.dh-electronics.de

1 0

[U-Boot] [PATCH] cfi_flash: Make all flash access functions weak
by Stefan Roese 17 Nov '08

17 Nov '08

This patch defines all flash access functions as weak so that they can be overridden by board specific versions. This will be used by the upcoming VCTH board support where the NOR FLASH unfortunately can't be accessed memory-mapped. Special accessor functions are needed here. Signed-off-by: Stefan Roese <sr(a)denx.de> --- drivers/mtd/cfi_flash.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 24e9b9f..4d82a51 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -209,38 +209,38 @@ struct cfi_pri_hdr { u8 minor_version; } __attribute__((packed)); -static void flash_write8(u8 value, void *addr) +static void __flash_write8(u8 value, void *addr) { __raw_writeb(value, addr); } -static void flash_write16(u16 value, void *addr) +static void __flash_write16(u16 value, void *addr) { __raw_writew(value, addr); } -static void flash_write32(u32 value, void *addr) +static void __flash_write32(u32 value, void *addr) { __raw_writel(value, addr); } -static void flash_write64(u64 value, void *addr) +static void __flash_write64(u64 value, void *addr) { /* No architectures currently implement __raw_writeq() */ *(volatile u64 *)addr = value; } -static u8 flash_read8(void *addr) +static u8 __flash_read8(void *addr) { return __raw_readb(addr); } -static u16 flash_read16(void *addr) +static u16 __flash_read16(void *addr) { return __raw_readw(addr); } -static u32 flash_read32(void *addr) +static u32 __flash_read32(void *addr) { return __raw_readl(addr); } @@ -251,6 +251,13 @@ static u64 __flash_read64(void *addr) return *(volatile u64 *)addr; } +void flash_write8(u8 value, void *addr)__attribute__((weak, alias("__flash_write8"))); +void flash_write16(u16 value, void *addr)__attribute__((weak, alias("__flash_write16"))); +void flash_write32(u32 value, void *addr)__attribute__((weak, alias("__flash_write32"))); +void flash_write64(u64 value, void *addr)__attribute__((weak, alias("__flash_write64"))); +u8 flash_read8(void *addr)__attribute__((weak, alias("__flash_read8"))); +u16 flash_read16(void *addr)__attribute__((weak, alias("__flash_read16"))); +u32 flash_read32(void *addr)__attribute__((weak, alias("__flash_read32"))); u64 flash_read64(void *addr)__attribute__((weak, alias("__flash_read64"))); /*----------------------------------------------------------------------- -- 1.6.0.4

2 7

[U-Boot] [PATCH] sh: Update SuperH serial driver
by Nobuhiro Iwamatsu 17 Nov '08

17 Nov '08

The address of SCFSR register is wrong at SH7720/SH7721. This patch fix this. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro(a)renesas.com> --- drivers/serial/serial_sh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c index f30532b..1d76a19 100644 --- a/drivers/serial/serial_sh.c +++ b/drivers/serial/serial_sh.c @@ -94,7 +94,7 @@ # define LSR_ORER 1 # define FIFOLEVEL_MASK 0x1F #elif defined(CONFIG_CPU_SH7720) -# define SCLSR (vu_short *)(SCIF_BASE + 0x24) +# define SCLSR SCFSR # define LSR_ORER 0x0200 # define FIFOLEVEL_MASK 0x1F #elif defined(CONFIG_CPU_SH7710) || \ -- 1.5.6.5

1 0

[U-Boot] [PATCH] sh: Update ms7722se board config
by Nobuhiro Iwamatsu 17 Nov '08

17 Nov '08

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- include/configs/ms7722se.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 9997c9b..5202004 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -31,10 +31,13 @@ #define CONFIG_MS7722SE 1 #define CONFIG_CMD_FLASH +#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NET +#define CONFIG_CMD_NFS #define CONFIG_CMD_PING #define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM +#define CONFIG_CMD_MEMORY #define CONFIG_CMD_ENV #define CONFIG_BAUDRATE 115200 -- 1.5.6.5

1 0

[U-Boot] [SPAM] D.entists Database for the United States
by Russell conclusive 17 Nov '08

17 Nov '08

Have a look at this new Directory -> 164,392 Dentist.s -> 158,588 Physical Addresses -> 163,967 Phone Nos -> 77,948 Fax Nos. -> 45,615 e mails during this week only a special price reduction is in effect - REG PRICE: $595 SALE PRICE: $297 To inquire please write to Pelletier(a)mediprodat.com Send email to release(a)mediprodat.com for deleted status

1 0

[U-Boot] ARM mach-types.h sync request
by Jared Holzman 17 Nov '08

17 Nov '08

Request sync with mach-types.h from kernel to bring in new mach type for our board TMQ CAPD. -- Regards, Jared Holzman ------------------------------------------------------------------------ *Electronics Design Engineer* *Genesys Electronics Design Pty Ltd* Unit 5, 33 Ryde Rd Pymble NSW, Australia 2073 Direct: +612 9496 8924 Phone: +612 9496 8900 Fax: +612 9496 8999 j.holzman(a)genesysdesign.com.au <mailto:j.holzman@genesysdesign.com.au> www.genesysdesign.com.au <http://www.genesysdesign.com.au> ------------------------------------------------------------------------

1 0

[U-Boot] [PATCH-OMAP3 v2] OMAP3: Fix error in gpmc_init
by dirk.behme＠googlemail.com 16 Nov '08

16 Nov '08

Fix error in gpmc_init() introduced with readl/writel conversion. Use base addresses + offset, not offset only. Minor clean up by removing unused code. Signed-off-by: Dirk Behme <dirk.behme(a)gmail.com> --- Changes in v2: - Correct patch header style. v2 of this patch makes previous version v1 obsolete. Jean-Christophe: Would be nice if you could handle this patch with priority as it prevents BeagleBoard from starting. Thanks! cpu/arm_cortexa8/omap3/mem.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) Index: u-boot-arm/cpu/arm_cortexa8/omap3/mem.c =================================================================== --- u-boot-arm.orig/cpu/arm_cortexa8/omap3/mem.c +++ u-boot-arm/cpu/arm_cortexa8/omap3/mem.c @@ -233,18 +233,15 @@ void enable_gpmc_config(u32 *gpmc_config void gpmc_init(void) { /* putting a blanket check on GPMC based on ZeBu for now */ - u32 mux = 0, mwidth; u32 *gpmc_config = NULL; u32 *gpmc_base = (u32 *)GPMC_BASE; + u32 *gpmc_cs_base = (u32 *)GPMC_CONFIG_CS0_BASE; u32 base = 0; u32 size = 0; u32 f_off = CONFIG_SYS_MONITOR_LEN; u32 f_sec = 0; u32 config = 0; - mux = BIT9; - mwidth = get_gpmc0_width(); - /* global settings */ writel(0, gpmc_base + OFFS(GPMC_IRQENABLE)); /* isr's sources masked */ writel(0, gpmc_base + OFFS(GPMC_TIMEOUT_CONTROL));/* timeout disable */ @@ -256,7 +253,7 @@ void gpmc_init(void) /* Disable the GPMC0 config set by ROM code * It conflicts with our MPDB (both at 0x08000000) */ - writel(0, GPMC_CONFIG_CS0 + GPMC_CONFIG7); + writel(0, gpmc_cs_base + OFFS(GPMC_CONFIG7)); sdelay(1000); #if defined(CONFIG_CMD_NAND) /* CS 0 */ @@ -280,7 +277,7 @@ void gpmc_init(void) #if defined(CONFIG_CMD_ONENAND) gpmc_config = gpmc_onenand; - onenand_cs_base = (u32 *)(GPMC_CONFIG_CS0 + + onenand_cs_base = (u32 *)(GPMC_CONFIG_CS0_BASE + (GPMC_CS * GPMC_CONFIG_WIDTH)); base = PISMO1_ONEN_BASE; size = PISMO1_ONEN_SIZE;

2 1

[U-Boot] [PATCH] MIPS: Add onenand_init() to board.c and move nand_init()
by Stefan Roese 16 Nov '08

16 Nov '08

This patch adds a call to onenand_init() for OneNAND support and moves the nand_init() call to an earlier place, so that the environment can be used from NAND and OneNAND. Signed-off-by: Stefan Roese <sr(a)denx.de> --- lib_mips/board.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib_mips/board.c b/lib_mips/board.c index 01dda69..1ccdc4a 100644 --- a/lib_mips/board.c +++ b/lib_mips/board.c @@ -29,6 +29,7 @@ #include <net.h> #include <environment.h> #include <nand.h> +#include <onenand_uboot.h> #include <spi.h> DECLARE_GLOBAL_DATA_PTR; @@ -387,6 +388,15 @@ void board_init_r (gd_t *id, ulong dest_addr) mem_malloc_init(); malloc_bin_reloc(); +#ifdef CONFIG_CMD_NAND + puts ("NAND: "); + nand_init (); /* go init the NAND */ +#endif + +#if defined(CONFIG_CMD_ONENAND) + onenand_init(); +#endif + /* relocate environment function pointers etc. */ env_relocate(); @@ -428,11 +438,6 @@ void board_init_r (gd_t *id, ulong dest_addr) } #endif -#ifdef CONFIG_CMD_NAND - puts ("NAND: "); - nand_init (); /* go init the NAND */ -#endif - #ifdef CONFIG_CMD_SPI puts ("SPI: "); spi_init (); /* go init the SPI */ -- 1.6.0.4

2 1