June 2009 - U-Boot

[U-Boot] PATCH add rgb555 for at91
by Giulio Benetti 23 Jun '09

23 Jun '09

Signed-off-by: giulio.benetti(a)micronovasrl.com diff -urpN b/common/lcd.c a/common/lcd.c --- b/common/lcd.c 2009-06-14 21:30:39.000000000 +0200 +++ a/common/lcd.c 2009-06-18 12:45:15.000000000 +0200 @@ -1,4 +1,4 @@ -/* +/*OC * Common LCD routines for supported CPUs * * (C) Copyright 2001-2002 @@ -575,6 +575,10 @@ void bitmap_plot (int x, int y) lut_entry = ((colreg & 0x000F) << 11) | ((colreg & 0x00F0) << 2) | ((colreg & 0x0F00) >> 7); +#elif defined (CONFIG_ATMEL_LCD_RGB555) + lut_entry = ((colreg & 0x000F) << 1) | + ((colreg & 0x00F0) << 2) | + ((colreg & 0x0F00) << 3); #else /* CONFIG_ATMEL_LCD_RGB565 */ lut_entry = ((colreg & 0x000F) << 1) | ((colreg & 0x00F0) << 3) | diff -urpN b/drivers/video/atmel_lcdfb.c a/drivers/video/atmel_lcdfb.c --- b/drivers/video/atmel_lcdfb.c 2009-06-14 21:30:39.000000000 +0200 +++ a/drivers/video/atmel_lcdfb.c 2009-06-18 12:45:15.000000000 +0200 @@ -57,6 +57,9 @@ void lcd_setcolreg(ushort regno, ushort #if defined(CONFIG_ATMEL_LCD_BGR555) lcdc_writel(panel_info.mmio, ATMEL_LCDC_LUT(regno), (red >> 3) | ((green & 0xf8) << 2) | ((blue & 0xf8) << 7)); +#elif defined(CONFIG_ATMEL_LCD_RGB555) + lcdc_writel(panel_info.mmio, ATMEL_LCDC_LUT(regno), + (blue >> 3) | ((green & 0xf8) << 2) | ((red & 0xf8) << 7)); #else lcdc_writel(panel_info.mmio, ATMEL_LCDC_LUT(regno), (blue >> 3) | ((green & 0xfc) << 3) | ((red & 0xf8) << 8)); -- Giulio Benetti R&D Micronova srl

2 5

[U-Boot] [PATCH] ppc4xx: Fix FDT EBC mappings on Canyonlands
by Felix Radensky 23 Jun '09

23 Jun '09

This patch fixes 2 problems with FDT EBC mappings on Canyonlands. First, NAND EBC mapping was missing, making Linux NAND driver unusable on this board. Second, NOR remapping code assumed that NOR is always on CS0, however when booting from NAND NOR is on CS3. --- board/amcc/canyonlands/canyonlands.c | 6 ++++-- include/configs/canyonlands.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c index 2b74689..cfc1023 100644 --- a/board/amcc/canyonlands/canyonlands.c +++ b/board/amcc/canyonlands/canyonlands.c @@ -575,15 +575,17 @@ int misc_init_r(void) #endif /* !defined(CONFIG_ARCHES) */ #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) +extern void __ft_board_setup(void *blob, bd_t *bd); + void ft_board_setup(void *blob, bd_t *bd) { u32 val[4]; int rc; - ft_cpu_setup(blob, bd); + __ft_board_setup(blob, bd); /* Fixup NOR mapping */ - val[0] = 0; /* chip select number */ + val[0] = CONFIG_SYS_NOR_CS; /* chip select number */ val[1] = 0; /* always 0 */ val[2] = CONFIG_SYS_FLASH_BASE_PHYS_L; /* we fixed up this address */ val[3] = gd->bd->bi_flashsize; diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index d814012..48c5198 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -132,9 +132,11 @@ */ #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_SYS_NOR_CS 0 /* NOR chip connected to CSx */ #define CONFIG_SYS_NAND_CS 3 /* NAND chip connected to CSx */ #else #define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ +#define CONFIG_SYS_NOR_CS 3 /* NOR chip connected to CSx */ #define CONFIG_SYS_NAND_CS 0 /* NAND chip connected to CSx */ #define CONFIG_ENV_IS_EMBEDDED 1 /* use embedded environment */ #endif -- 1.5.4.3

2 1

[U-Boot] [PATCH ... resent] Atmel LCD driver GUARDTIME fix
by Mark Jackson 23 Jun '09

23 Jun '09

This patch correctly sets up the guard time parameter in the Atmel LCDC driver. This works on the AVR32 platform, but needs to be tested under the AT91 platform which shares the same code base. Signed-off-by: Mark Jackson <mpfj(a)mimc.co.uk> --- drivers/video/atmel_lcdfb.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 3a51cc7..14f578e 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -42,6 +42,7 @@ short console_row; /* configurable parameters */ #define ATMEL_LCDC_CVAL_DEFAULT 0xc8 #define ATMEL_LCDC_DMA_BURST_LEN 8 +#define ATMEL_LCDC_GUARD_TIME 2 #if defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91CAP9) #define ATMEL_LCDC_FIFO_SIZE 2048 @@ -69,7 +70,7 @@ void lcd_ctrl_init(void *lcdbase) /* Turn off the LCD controller and the DMA controller */ lcdc_writel(panel_info.mmio, ATMEL_LCDC_PWRCON, - 1 << ATMEL_LCDC_GUARDT_OFFSET); + ATMEL_LCDC_GUARD_TIME << ATMEL_LCDC_GUARDT_OFFSET); /* Wait for the LCDC core to become idle */ while (lcdc_readl(panel_info.mmio, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY) @@ -150,7 +151,7 @@ void lcd_ctrl_init(void *lcdbase) lcdc_writel(panel_info.mmio, ATMEL_LCDC_DMACON, ATMEL_LCDC_DMAEN); lcdc_writel(panel_info.mmio, ATMEL_LCDC_PWRCON, - (1 << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR); + (ATMEL_LCDC_GUARD_TIME << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR); } ulong calc_fbsize(void)

4 10

[U-Boot] PATCH: Fixed PPC4xx compilation warning in 4xx_enet.c
by Alessio Centazzo 23 Jun '09

23 Jun '09

This patch fixes a compilation warning for some Ethernet PHY-less PPC4xx platforms (440SPE based ones) and a potential compilation error for 440SP platforms (use of undefined 'ethgroup' variable). In the original code and in case of 440SPE platforms, 'ethgroup' is initialized to -1 and never modified. Later in the function, within an #ifdef statement, an 'if statement' executes code only if 'ethgroup' is set to 4, therefore it is harmless to avoid executing the 'if statement' by removing the CONFIG_440SPE from the affected #ifdefs. In case of 440SP platforms with on-board Ethernet PHY, 'ethgroup' is undefined but used (there are not such platforms in the repository yet). All other architectures are not affected by this change. This is the current warning message with a Ethernet PHY-less 440SPE platform build (there is not such platform in the repository yet): 4xx_enet.c: In function 'ppc_4xx_eth_init': 4xx_enet.c:880: warning: unused variable 'ethgroup' Signed-off-by: Alessio Centazzo acpatin {AT} yahoo {DOT} com diff -Nau u-boot-2009.06/drivers/net/4xx_enet.c.orig u-boot-2009.06/drivers/net/4xx_enet.c --- u-boot-2009.06/drivers/net/4xx_enet.c.orig 2009-06-14 12:30:39.000000000 -0700 +++ u-boot-2009.06/drivers/net/4xx_enet.c 2009-06-17 08:34:54.000000000 -0700 @@ -873,7 +873,7 @@ defined(CONFIG_405EX) u32 opbfreq; sys_info_t sysinfo; -#if defined(CONFIG_440GX) || defined(CONFIG_440SPE) || \ +#if defined(CONFIG_440GX) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT) || \ defined(CONFIG_405EX) @@ -1122,7 +1122,6 @@ #if defined(CONFIG_440GX) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ - defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT) || \ defined(CONFIG_405EX)

2 1

[U-Boot] PATCH: Fixed PPC4xx debug compilation error in uic.c
by Alessio Centazzo 23 Jun '09

23 Jun '09

This patch fixes a debug compilation error for PPC4xx platforms, all other architectures are not affected by this change. The 'handler' pointer was undefined. The fix is exercised and has effect only if DEBUG is defined. Signed-off-by: Alessio Centazzo acpatin {AT} yahoo {DOT} com diff u-boot-2009.06/cpu/ppc4xx/uic.c.orig u-boot-2009.06/cpu/ppc4xx/uic.c --- u-boot-2009.06/cpu/ppc4xx/uic.c.orig 2009-06-14 12:30:39.000000000 -0700 +++ u-boot-2009.06/cpu/ppc4xx/uic.c 2009-06-16 23:04:14.000000000 -0700 @@ -164,7 +164,7 @@ else if (vec >= 96) mtdcr(uic3er, mfdcr(uic3er) | UIC_MASK(vec)); - debug("Install interrupt for vector %d ==> %p\n", vec, handler); + debug("Enable interrupt for vector %d\n", vec); } void pic_irq_disable(unsigned int vec)

2 1

[U-Boot] Problem with uboot booting image
by Rahanesh 23 Jun '09

23 Jun '09

Hi All, I am trying to boot Linux from uboot. I have cross compiled Linux and ramdisk for my board. After cross compilation i did a tftp to download the image(Linux + Filesystem) to RAM(0x80800000) . From there i copied it to flash(0xad040000). Now on a reset u boot comes up and then when trying to bring LINUX it throws an error saying Verifying Checksum.......Bad data CRC. Then uboot prompt appears. This is what happened..... U-Boot 1.1.2 (Jun 10 2008 - 18:55:13) Board: MIPS CPU Speed 200 MHz DRAM: 16 MB sflash.c:266:DF_F_DataflashProbe: Entered sflash.c:269:DF_F_DataflashProbe: flash type is 0x1 sflash.c:270:DF_F_DataflashProbe: num pages 32768 DataFlash:Nb pages: 32768 Page Size: 256 Size= 8388608 bytes Logical address: 0xAD000000 Nb Erase Blocks: 128 Erase Block Size: 65536 Area 0: AD000000 to AD003FFF Area 1: AD004000 to AD03FFFF Area 2: AD040000 to AD30BFFF Area 3: AD30C000 to AD7FFFFF crc matched In: serial Out: serial Err: serial Net: Eth. Type "run flash_nfs" to mount root filesystem over NFS Hit any key to stop autoboot: 0 ### JFFS2 loading '/boot/uImage' to 0x80800000 Scanning JFFS2 FS: .................... done. ### JFFS2 load complete: 3249008 bytes loaded to 0x80800000 ## Booting image at 80800000 ... Image Name: Linux Kernel Image with ramdisk. Created: 2009-06-22 4:37:12 UTC Image Type: MIPS Linux Kernel Image (gzip compressed) Data Size: 3248944 Bytes = 3.1 MB Load Address: 80100000 Entry Point: 80578000 Verifying Checksum ... Bad Data CRC UBOOT> UBOOT # printenv bootargs=console=ttyS0,38400 nofpu mem=14M root=/dev/ram0 rw bootcmd=fsload 0x80800000 /boot/uImage; bootm 0x80800000 bootdelay=5 baudrate=38400 ethaddr=00:06:0D:00:00:00 preboot=echo;echo Type "run flash_nfs" to mount root filesystem over NFS;echo nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) btargs=setenv bootargs console=ttyS0,$(baudrate) nofpu mem=30M root=/dev/ram0 rw addip=setenv bootargs $(bootargs) ip=$(ipaddr):$(serverip):$(gatewayip):$(netmas k):$(hostname):$(netdev):off addmisc=setenv bootargs $(bootargs) console=ttyS0,$(baudrate) ethaddr=$(ethaddr) panic=1 flash_nfs=run nfsargs addip addmisc;bootm $(kernel_addr) flash_self=run ramargs addip addmisc;bootm $(kernel_addr) $(ramdisk_addr) net_nfs=tftp 80500000 $(bootfile);run nfsargs addip addmisc;bootm netbootfile=uImage jffsfile=jffs.1.1 progjffs=tftp 0x80800000 $(jffsfile); erase 0xad040000 0xad3bffff; cp.b 0x808000 00 0xad040000 $(filesize) imget=tftp 0x80800000 refmta.bin;erase 0xad000000 0xad3e0000;cp.b 0x80800000 0xa d000000 $(filesize) localbootfile=/boot/uImage bootnet=tftp 0x80800000 $(netbootfile); bootm 0x80800000 kernel_addr=AD040000 u-bootfile=u-boot.ctlm.bin load-ub=tftp 80504000 $(u-bootfile) update-ub=protect off 1:0-4;cp.b AD000000 80500000 4000;cp.b AD03F000 8053F000 1 000;erase 0xAD000000 0xAD03ffff;cp.b 80500000 AD000000 0x40000 btlinux=fsload 0x80800000 $(localbootfile); bootm 0x80800000 ethact=Eth. netmask=255.255.0.0 serverip=10.47.3.54 ipaddr=10.47.252.254 stdin=serial stdout=serial stderr=serial filesize=319370 Environment size: 1554/4092 bytes Please throw some light on this. Thanks Rahanesh -- View this message in context: http://www.nabble.com/Problem-with-uboot-booting-image-tp24160664p24160664.… Sent from the Uboot - Users mailing list archive at Nabble.com.

1 0

[U-Boot] U-boot partition size information
by Nathan French 23 Jun '09

23 Jun '09

I've got a kilauea-ish board that we've decided needs more room in one of the flash partitions. So I took the existing command line: Kernel command line: ramdisk_size=65536 root=/dev/ram rw mtdparts=fc000000.nor_flash:2M(linux),20M(ramdisk),4M(jffs2),38272k(user),256k(env),384k(uboot) ip=10.2.3.28:10.1.0.65:10.0.0.1::kilauea:eth0:off panic=1 console=ttyS0,115200 And modified it like below (4M -> 8M, 38272k->34176k). We're not currently using the user partition, so I just borrowed 4MB from it. Kernel command line: ramdisk_size=65536 root=/dev/ram rw mtdparts=fc000000.nor_flash:2M(linux),20M(ramdisk),8M(jffs2),34176k(user),256k(env),384k(uboot) ip=10.2.3.28:10.1.0.65:10.0.0.1::kilauea:eth0:off panic=1 console=ttyS0,115200 And I get the below error. I noticed that the device tree (FDT/DTB) lists some partitions as well that don't exactly match up with the original parameters, so I ignored that part of the FDT. Is this ok? Does Linux ignore the partition information from the FDT when U-Boot passes partition arguments? Oh and... well why is the ram0 device complaining when I modify the flash partitioning? RAMDISK: Compressed image found at block 0 RAMDISK: incomplete write (24576 != 32768) 35815424 VFS: Mounted root (ext2 filesystem) readonly. Freeing unused kernel memory: 136k init attempt to access beyond end of device ram0: rw=0, want=98312, limit=70000 EXT2-fs error (device ram0): ext2_get_inode: unable to read inode block - inode=12289, block=49155 Warning: unable to open an initial console. attempt to access beyond end of device ram0: rw=0, want=98312, limit=70000 EXT2-fs error (device ram0): ext2_get_inode: unable to read inode block - inode=12289, block=49155 attempt to access beyond end of device ram0: rw=0, want=98312, limit=70000 EXT2-fs error (device ram0): ext2_get_inode: unable to read inode block - inode=12289, block=49155 attempt to access beyond end of device ram0: rw=0, want=98312, limit=70000 ... Thanks, Nathan French

1 0

[U-Boot] [PATCH 2/2] nand_spl: read environment early, when booting from NAND using nand_spl
by Guennadi Liakhovetski 22 Jun '09

22 Jun '09

Currently, when booting from NAND using nand_spl, in the beginning the default environment is used until later in boot process the dynamic environment is read out. This way environment variables that must be interpreted early, like the baudrate or "silent", cannot be modified dynamically and remain at their default values. Fix this problem by reading out main and redundand (if used) copies of the environment in the nand_spl code. Signed-off-by: Guennadi Liakhovetski <lg(a)denx.de> --- README | 6 ++++++ common/env_nand.c | 43 ++++++++++++++++++++++++++++++------------- include/configs/smdk6400.h | 3 +++ nand_spl/nand_boot.c | 10 ++++++++++ 4 files changed, 49 insertions(+), 13 deletions(-) diff --git a/README b/README index 142dbcc..060b676 100644 --- a/README +++ b/README @@ -2422,6 +2422,12 @@ to save the current settings. to a block boundary, and CONFIG_ENV_SIZE must be a multiple of the NAND devices block size. +- CONFIG_NAND_ENV_DST + + Defines address in RAM to which the nand_spl code should copy the + environment. If redundant environment is used, it will be copied to + CONFIG_NAND_ENV_DST + CONFIG_ENV_SIZE. + - CONFIG_SYS_SPI_INIT_OFFSET Defines offset to the initial SPI buffer area in DPRAM. The diff --git a/common/env_nand.c b/common/env_nand.c index 21bce25..90a1c45 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -68,9 +68,11 @@ extern int default_environment_size; char * env_name_spec = "NAND"; -#ifdef ENV_IS_EMBEDDED +#if defined(ENV_IS_EMBEDDED) extern uchar environment[]; env_t *env_ptr = (env_t *)(&environment[0]); +#elif defined(CONFIG_NAND_ENV_DST) +env_t *env_ptr = (env_t *)CONFIG_NAND_ENV_DST; #else /* ! ENV_IS_EMBEDDED */ env_t *env_ptr = 0; #endif /* ENV_IS_EMBEDDED */ @@ -102,23 +104,33 @@ uchar env_get_char_spec (int index) */ int env_init(void) { -#if defined(ENV_IS_EMBEDDED) +#if defined(ENV_IS_EMBEDDED) || defined(CONFIG_NAND_ENV_DST) int crc1_ok = 0, crc2_ok = 0; - env_t *tmp_env1, *tmp_env2; + env_t *tmp_env1; + +#ifdef CONFIG_ENV_OFFSET_REDUND + env_t *tmp_env2; - tmp_env1 = env_ptr; tmp_env2 = (env_t *)((ulong)env_ptr + CONFIG_ENV_SIZE); + crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc); +#endif + + tmp_env1 = env_ptr; crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc); - crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc); - if (!crc1_ok && !crc2_ok) + if (!crc1_ok && !crc2_ok) { + gd->env_addr = 0; gd->env_valid = 0; - else if(crc1_ok && !crc2_ok) + + return 0; + } else if (crc1_ok && !crc2_ok) { gd->env_valid = 1; - else if(!crc1_ok && crc2_ok) + } +#ifdef CONFIG_ENV_OFFSET_REDUND + else if (!crc1_ok && crc2_ok) { gd->env_valid = 2; - else { + } else { /* both ok - check serial */ if(tmp_env1->flags == 255 && tmp_env2->flags == 0) gd->env_valid = 2; @@ -132,14 +144,19 @@ int env_init(void) gd->env_valid = 1; } + if (gd->env_valid == 2) + env_ptr = tmp_env2; + else +#endif if (gd->env_valid == 1) env_ptr = tmp_env1; - else if (gd->env_valid == 2) - env_ptr = tmp_env2; -#else /* ENV_IS_EMBEDDED */ + + gd->env_addr = (ulong)env_ptr->data; + +#else /* ENV_IS_EMBEDDED || CONFIG_NAND_ENV_DST */ gd->env_addr = (ulong)&default_environment[0]; gd->env_valid = 1; -#endif /* ENV_IS_EMBEDDED */ +#endif /* ENV_IS_EMBEDDED || CONFIG_NAND_ENV_DST */ return (0); } diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h index cac58cf..018f576 100644 --- a/include/configs/smdk6400.h +++ b/include/configs/smdk6400.h @@ -209,6 +209,9 @@ /* total memory available to uboot */ #define CONFIG_SYS_UBOOT_SIZE (1024 * 1024) +/* Put environment copies after the end of U-Boot owned RAM */ +#define CONFIG_NAND_ENV_DST (CONFIG_SYS_UBOOT_BASE + CONFIG_SYS_UBOOT_SIZE) + #ifdef CONFIG_ENABLE_MMU #define CONFIG_SYS_MAPPED_RAM_BASE 0xc0000000 #define CONFIG_BOOTCOMMAND "nand read 0xc0018000 0x60000 0x1c0000;" \ diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c index c7eadad..be2e69c 100644 --- a/nand_spl/nand_boot.c +++ b/nand_spl/nand_boot.c @@ -246,6 +246,16 @@ void nand_boot(void) ret = nand_load(&nand_info, CONFIG_SYS_NAND_U_BOOT_OFFS, CONFIG_SYS_NAND_U_BOOT_SIZE, (uchar *)CONFIG_SYS_NAND_U_BOOT_DST); +#ifdef CONFIG_NAND_ENV_DST + nand_load(&nand_info, CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, + (uchar *)CONFIG_NAND_ENV_DST); + +#ifdef CONFIG_ENV_OFFSET_REDUND + nand_load(&nand_info, CONFIG_ENV_OFFSET_REDUND, CONFIG_ENV_SIZE, + (uchar *)CONFIG_NAND_ENV_DST + CONFIG_ENV_SIZE); +#endif +#endif + if (nand_chip.select_chip) nand_chip.select_chip(&nand_info, -1); -- 1.6.2.4

2 3

[U-Boot] Access JFFS2 partition from U-Boot
by Guillaume Spalla 22 Jun '09

22 Jun '09

Dear all, I am new with U-Boot, and I am trying to access the content of a JFFS2 partition from u-boot. I am working with an at91sam9263 board, with nand flash. In u-boot, I added the #define CONFIG_CMD_JFFS2, as well as CONFIG_JFFS2_NAND_OFF, CONFIG_JFFS2_NAND_SIZE and CONFIG_JFFS2_NAND_DEV. I then have a crash during the compilation of u-boot in the file jffs2_1pass.c, in the function get_fl_mem_nor: jffs2_1pass.c:389: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'flash_info' | jffs2_1pass.c:389: error: 'flash_info' undeclared (first use in this function) | jffs2_1pass.c:389: error: (Each undeclared identifier is reported only once | jffs2_1pass.c:389: error: for each function it appears in.) | jffs2_1pass.c:389: error: expected expression before ']' token | jffs2_1pass.c:390: error: 'flash_info_t' undeclared (first use in this function) | jffs2_1pass.c:390: error: 'flash' undeclared (first use in this function) | make[1]: *** [jffs2_1pass.o] Error 1 If I remove the #define related to JFFS2, u-boot is compiling correctly. Does anyone already had this problem ? Thanks in advance, Guillaume Spalla

2 1

[U-Boot] [PATCH] nand_init: use loff_t for offset
by Jean-Christophe PLAGNIOL-VILLARD 22 Jun '09

22 Jun '09

nand_init currently use size_t which is arch dependent and not always a unsigned long. Now use loff_t as the linux mtd layer Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> Cc: Scott Wood <scottwood(a)freescale.com> --- drivers/mtd/nand/nand_util.c | 20 ++++++++++---------- include/nand.h | 14 +++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index 6ba52b3..dc7eacd 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -312,7 +312,7 @@ int nand_lock(struct mtd_info *mtd, int tight) * NAND_LOCK_STATUS_UNLOCK: page unlocked * */ -int nand_get_lock_status(struct mtd_info *mtd, ulong offset) +int nand_get_lock_status(struct mtd_info *mtd, loff_t offset) { int ret = 0; int chipnr; @@ -433,7 +433,7 @@ int nand_unlock(struct mtd_info *mtd, ulong start, ulong length) * @param length image length * @return image length including bad blocks */ -static size_t get_len_incl_bad (nand_info_t *nand, size_t offset, +static size_t get_len_incl_bad (nand_info_t *nand, loff_t offset, const size_t length) { size_t len_incl_bad = 0; @@ -470,7 +470,7 @@ static size_t get_len_incl_bad (nand_info_t *nand, size_t offset, * @param buf buffer to read from * @return 0 in case of success */ -int nand_write_skip_bad(nand_info_t *nand, size_t offset, size_t *length, +int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, u_char *buffer) { int rval; @@ -495,7 +495,7 @@ int nand_write_skip_bad(nand_info_t *nand, size_t offset, size_t *length, if (len_incl_bad == *length) { rval = nand_write (nand, offset, length, buffer); if (rval != 0) - printf ("NAND write to offset %zx failed %d\n", + printf ("NAND write to offset %llx failed %d\n", offset, rval); return rval; @@ -506,7 +506,7 @@ int nand_write_skip_bad(nand_info_t *nand, size_t offset, size_t *length, size_t write_size; if (nand_block_isbad (nand, offset & ~(nand->erasesize - 1))) { - printf ("Skip bad block 0x%08zx\n", + printf ("Skip bad block 0x%08llx\n", offset & ~(nand->erasesize - 1)); offset += nand->erasesize - block_offset; continue; @@ -519,7 +519,7 @@ int nand_write_skip_bad(nand_info_t *nand, size_t offset, size_t *length, rval = nand_write (nand, offset, &write_size, p_buffer); if (rval != 0) { - printf ("NAND write to offset %zx failed %d\n", + printf ("NAND write to offset %llx failed %d\n", offset, rval); *length -= left_to_write; return rval; @@ -547,7 +547,7 @@ int nand_write_skip_bad(nand_info_t *nand, size_t offset, size_t *length, * @param buffer buffer to write to * @return 0 in case of success */ -int nand_read_skip_bad(nand_info_t *nand, size_t offset, size_t *length, +int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, u_char *buffer) { int rval; @@ -565,7 +565,7 @@ int nand_read_skip_bad(nand_info_t *nand, size_t offset, size_t *length, if (len_incl_bad == *length) { rval = nand_read (nand, offset, length, buffer); if (rval != 0) - printf ("NAND read from offset %zx failed %d\n", + printf ("NAND read from offset %llx failed %d\n", offset, rval); return rval; @@ -576,7 +576,7 @@ int nand_read_skip_bad(nand_info_t *nand, size_t offset, size_t *length, size_t read_length; if (nand_block_isbad (nand, offset & ~(nand->erasesize - 1))) { - printf ("Skipping bad block 0x%08zx\n", + printf ("Skipping bad block 0x%08llx\n", offset & ~(nand->erasesize - 1)); offset += nand->erasesize - block_offset; continue; @@ -589,7 +589,7 @@ int nand_read_skip_bad(nand_info_t *nand, size_t offset, size_t *length, rval = nand_read (nand, offset, &read_length, p_buffer); if (rval != 0) { - printf ("NAND read from offset %zx failed %d\n", + printf ("NAND read from offset %llx failed %d\n", offset, rval); *length -= left_to_read; return rval; diff --git a/include/nand.h b/include/nand.h index 065a42c..23f3ca1 100644 --- a/include/nand.h +++ b/include/nand.h @@ -38,22 +38,22 @@ typedef struct mtd_info nand_info_t; extern int nand_curr_device; extern nand_info_t nand_info[]; -static inline int nand_read(nand_info_t *info, off_t ofs, size_t *len, u_char *buf) +static inline int nand_read(nand_info_t *info, loff_t ofs, size_t *len, u_char *buf) { return info->read(info, ofs, *len, (size_t *)len, buf); } -static inline int nand_write(nand_info_t *info, off_t ofs, size_t *len, u_char *buf) +static inline int nand_write(nand_info_t *info, loff_t ofs, size_t *len, u_char *buf) { return info->write(info, ofs, *len, (size_t *)len, buf); } -static inline int nand_block_isbad(nand_info_t *info, off_t ofs) +static inline int nand_block_isbad(nand_info_t *info, loff_t ofs) { return info->block_isbad(info, ofs); } -static inline int nand_erase(nand_info_t *info, off_t off, size_t size) +static inline int nand_erase(nand_info_t *info, loff_t off, size_t size) { struct erase_info instr; @@ -110,9 +110,9 @@ struct nand_erase_options { typedef struct nand_erase_options nand_erase_options_t; -int nand_read_skip_bad(nand_info_t *nand, size_t offset, size_t *length, +int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, u_char *buffer); -int nand_write_skip_bad(nand_info_t *nand, size_t offset, size_t *length, +int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, u_char *buffer); int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts); @@ -122,7 +122,7 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts); int nand_lock( nand_info_t *meminfo, int tight ); int nand_unlock( nand_info_t *meminfo, ulong start, ulong length ); -int nand_get_lock_status(nand_info_t *meminfo, ulong offset); +int nand_get_lock_status(nand_info_t *meminfo, loff_t offset); #ifdef CONFIG_SYS_NAND_SELECT_DEVICE void board_nand_select_device(struct nand_chip *nand, int chip); -- 1.6.2.4

2 3