April 2011 - U-Boot

[U-Boot] Pull request: u-boot-fdt
by Gerald Van Baren 27 Apr '11

27 Apr '11

Dear Wolfgang, The following pull request is for Grant Likely's changes "[PATCH 0/6] ARM device tree support improvements". I had to make two minor fixes, a missing ";" in patch [1 of 6] and a misspelling in patch [2 of 6] s/getenv_bootm_base/getenv_bootm_low/ Note that I did *not* include patch [6 of 6] "Add CONFIG_OF_LIBFDT to more boards" since that is an ARM patch and should be applied by the various ARM custodians. The following changes since commit a01ebd9679f07421ec5abfda5dc0ab76c7202d3b: Heiko Schocher (1): mpc52xx, digsy_mtc: add trickle charger support for rev5 boards. are available in the git repository at: git://git.denx.de/u-boot-fdt.git master Grant Likely (5): Stop passing around bootmem_base value. Default to bootm_size() when CONFIG_SYS_BOOTMAPSZ is not defined Remove device tree booting dependency on CONFIG_SYS_BOOTMAPSZ Fix off-by-one error in passing initrd end address via device tree Respect memreserve regions specified in the device tree README | 16 ++++++++- arch/arm/lib/bootm.c | 5 ++- arch/m68k/lib/bootm.c | 7 +--- arch/powerpc/lib/bootm.c | 19 +++++----- common/cmd_bootm.c | 7 ++-- common/fdt_support.c | 2 +- common/image.c | 72 ++++++++++++++++++++++++++++++---------- include/configs/omap3_beagle.h | 7 ---- include/image.h | 10 +++--- 9 files changed, 93 insertions(+), 52 deletions(-) Best regards, gvb

3 2

[U-Boot] [PATCH 0/3] Blackfin minor config updates for 2011.06
by Mike Frysinger 27 Apr '11

27 Apr '11

Now that the mmc_spi driver has been merged, we can convert the Blackfin boards over to it. And since some other patches have been merged now, we can push the Blackfin config updates as well. Mike Frysinger (3): Blackfin: bf537-stamp/bf527-ad7160-eval: convert to mmc_spi Blackfin: bf506f-ezkit: disable import/export env commands Blackfin: adi boards: add eon to the "all" spi flash list include/configs/bf506f-ezkit.h | 2 ++ include/configs/bf527-ad7160-eval.h | 5 ++--- include/configs/bf537-stamp.h | 3 ++- include/configs/bfin_adi_common.h | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) -- 1.7.5.rc1

2 5

[U-Boot] [PATCH 0/2] SPI updates
by Mike Frysinger 27 Apr '11

27 Apr '11

Looks like a few patches were merged from Thomas' series, but the core piece was missed, as well as the new Blackfin support for it. The new mmc_spi driver that has been merged already into mainline uses these for example. Thomas Chou (2): spi: add spi_set_speed func bfin_spi: add spi_set_speed drivers/spi/bfin_spi.c | 32 +++++++++++++++++++------------- include/spi.h | 8 ++++++++ 2 files changed, 27 insertions(+), 13 deletions(-) -- 1.7.5.rc1

2 4

[U-Boot] [PATCH v5] ARM: mx31: Print the silicon version
by Fabio Estevam 27 Apr '11

27 Apr '11

Use the same method of the Linux kernel to print the MX31 silicon version on boot. Tested on a MX31PDK with a 2.0 silicon, where it shows: CPU: Freescale i.MX31 rev 2.0 at 531 MHz Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v4: - Get rid of imx_soc_revision.h and its macro Changes since v3: - Keep consistency with other i.MX processors and print the silicon version in the same line as the CPU name - Remove unneeded blank line in imx_soc_revision.h Changes since v2: - Use macro instead of defines for IMX_CHIP_REVISION Changes since v1: - rename the CPU detect function name to get_cpu_rev - Use struct to access iim register arch/arm/cpu/arm1136/mx31/generic.c | 30 +++++++++++++++++++++++++++- arch/arm/include/asm/arch-mx31/imx-regs.h | 25 ++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c index fa07fec..9b7a7a2 100644 --- a/arch/arm/cpu/arm1136/mx31/generic.c +++ b/arch/arm/cpu/arm1136/mx31/generic.c @@ -106,11 +106,37 @@ void mx31_set_pad(enum iomux_pins pin, u32 config) } +struct mx3_cpu_type mx31_cpu_type[] = { + { .srev = 0x00, .v = "1.0" }, + { .srev = 0x10, .v = "1.1" }, + { .srev = 0x11, .v = "1.1" }, + { .srev = 0x12, .v = "1.15" }, + { .srev = 0x13, .v = "1.15" }, + { .srev = 0x14, .v = "1.2" }, + { .srev = 0x15, .v = "1.2" }, + { .srev = 0x28, .v = "2.0" }, + { .srev = 0x29, .v = "2.0" }, +}; + +char *get_cpu_rev(void) +{ + u32 i, srev; + + /* read SREV register from IIM module */ + struct iim_regs *iim = (struct iim_regs *)MX31_IIM_BASE_ADDR; + srev = readl(&iim->iim_srev); + + for (i = 0; i < ARRAY_SIZE(mx31_cpu_type); i++) + if (srev == mx31_cpu_type[i].srev) + return mx31_cpu_type[i].v; + return "unknown"; +} + #if defined(CONFIG_DISPLAY_CPUINFO) int print_cpuinfo (void) { - printf("CPU: Freescale i.MX31 at %d MHz\n", - mx31_get_mcu_main_clk() / 1000000); + printf("CPU: Freescale i.MX31 rev %s at %d MHz\n", + get_cpu_rev(), mx31_get_mcu_main_clk() / 1000000); return 0; } #endif diff --git a/arch/arm/include/asm/arch-mx31/imx-regs.h b/arch/arm/include/asm/arch-mx31/imx-regs.h index 37337f2..0eeaf39 100644 --- a/arch/arm/include/asm/arch-mx31/imx-regs.h +++ b/arch/arm/include/asm/arch-mx31/imx-regs.h @@ -84,6 +84,29 @@ struct wdog_regs { u16 wrsr; /* Reset Status */ }; +/* IIM Control Registers */ +struct iim_regs { + u32 iim_stat; + u32 iim_statm; + u32 iim_err; + u32 iim_emask; + u32 iim_fctl; + u32 iim_ua; + u32 iim_la; + u32 iim_sdat; + u32 iim_prev; + u32 iim_srev; + u32 iim_prog_p; + u32 iim_scs0; + u32 iim_scs1; + u32 iim_scs2; + u32 iim_scs3; +}; + +struct mx3_cpu_type { + u8 srev; + const char *v; +}; #define IOMUX_PADNUM_MASK 0x1ff #define IOMUX_PIN(gpionum, padnum) ((padnum) & IOMUX_PADNUM_MASK) @@ -480,6 +503,8 @@ enum iomux_pins { #define CCMR_FPM (1 << 1) #define CCMR_CKIH (2 << 1) +#define MX31_IIM_BASE_ADDR 0x5001C000 + #define PDR0_CSI_PODF(x) (((x) & 0x1ff) << 23) #define PDR0_PER_PODF(x) (((x) & 0x1f) << 16) #define PDR0_HSP_PODF(x) (((x) & 0x7) << 11) -- 1.6.0.4

6 10

[U-Boot] Query - BF537 STAMP Board U-boot Prompt‏
by sarosh 27 Apr '11

27 Apr '11

We are currently working on a project related to IP telephony.For that we need to load uClinux Image file to BF537 STAMP board. We hope to benefit from your guidance. The main error we are encountering is that, U-boot prompt from BF537 STAMP is not showing up on minicom/kermit or any other terminal program. Here is the procedure we are following. We are using BF537 STAMP board and OS Ubuntu 9.04 Jaunty Version. We have installed USB to serial converter drivers in ubuntu and then tried to load u-boot by typing bfin-uclinux-ldr -l u-boot.ldr /dev/ttyUSB0 CLI output is bfin-uclinux-ldr -l u-boot.ldr /dev/ttyUSB0 Loading LDR u-boot.ldr ... OK! Opening /dev/ttyUSB0 ... OK! Configuring terminal I/O ... OK! Trying to send autobaud ... OK! Trying to read autobaud ... OK! Checking autobaud ... OK! Autobaud result: 115200bps 49.766mhz (header:0xBF DLL:0x1B DLH:0x00 fin:0x00) Sending blocks of DXE 1 ... [1/2] [2/2] OK! Sending blocks of DXE 2 ... [1/5] [2/5] [3/5] [4/5] [5/5] OK! You may want to run minicom or kermit now We tried it with both minicom and kermit. With keystrokes, the screen showed a few bytes return on minicom and kermit showed this result on CLI bfin>connect Connecting to /dev/ttyUSB0, speed 57600 Escape character: Ctrl-\ (ASCII 28, FS): enabled Type the escape character followed by C to get back, or followed by ? to see other options. after exit it showed back to ossie@desktop >bfin Now here if we type version or any uboot command here it should work, but on our pc it is actually the kermit interface not u boot and version command shows the Kermit-C version. The initial settings for kermit and minicom are given below: In minicom the following parameters were set 57600 baud 8 data bits Parity none 1 stop bit H/W flow control off and then we set the modem and dailing options. Then we powered up the STAMP board but still the u-boot CLI did not show up,Only a few bytes showed up upon keystrokes after resetting the board. Kermit settings are as under: set line /dev/ttyS0 define sz !sz \%0 > /dev/ttyS0 < /dev/ttyS0 set speed 57600 set carrier-watch off set prefixing all set parity none set stop-bits 1 set modem none set file type bin set file name lit set flow-control none set prompt "bfin> " We have set the board to following settings i.e. SW16: Set the boot mode switch to position 7 JP9: Removed the UART loop back jumper SW4: Set UART switch to {OFF,ON,OFF,ON} SW6: Set flash switch to {ON,ON,ON,ON} We have also tried to load u-boot.ldr using ldrviewer in Windows XP and then accesing it in kermit or minicom in Ubuntu and hyperterminal on Windows XP but no u-boot prompt was seen in any terminal program. Dear all, please guide us, where are we going wrong or suggest some other authenticated procedure to get the u-boot prompt up and running -- View this message in context: http://old.nabble.com/Query---BF537-STAMP-Board-U-boot-Prompt%E2%80%8F-tp31… Sent from the Uboot - Users mailing list archive at Nabble.com.

2 3

[U-Boot] 回覆: [PATCH v2] cmd_nvedit.c: clean up with checkpatch
by macpaul＠andestech.com 27 Apr '11

27 Apr '11

Hi Detlev, > Hi, > > > Code clean up of cmd_nvedit.c by using checkpatch.pl. > > Thanks for taking the initiative to do some cleanup! > > > Signed-off-by: Macpaul Lin <macpaul(a)andestech.com> > > Still, the patch fails for me: > > Applying: cmd_nvedit.c: clean up with checkpatch > Using index info to reconstruct a base tree... Please check the same mail thread, I've send patch v3 already. Thanks Best regards, Macpaul Lin

3 2

[U-Boot] [PATCH 1/2] MX31: mx31pdk: Add watchdog support
by Fabio Estevam 27 Apr '11

27 Apr '11

Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/freescale/mx31pdk/mx31pdk.c | 16 ++++++++++++++++ include/configs/mx31pdk.h | 1 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/board/freescale/mx31pdk/mx31pdk.c b/board/freescale/mx31pdk/mx31pdk.c index a9f0fb4..4a5d3ef 100644 --- a/board/freescale/mx31pdk/mx31pdk.c +++ b/board/freescale/mx31pdk/mx31pdk.c @@ -28,9 +28,17 @@ #include <netdev.h> #include <asm/arch/mx31.h> #include <asm/arch/mx31-regs.h> +#include <watchdog.h> DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_HW_WATCHDOG +void hw_watchdog_reset(void) +{ + mxc_hw_watchdog_reset(); +} +#endif + int dram_init(void) { /* dram_init must store complete ramsize in gd->ram_size */ @@ -68,6 +76,14 @@ int board_init(void) return 0; } +int board_late_init(void) +{ +#ifdef CONFIG_HW_WATCHDOG + mxc_hw_watchdog_enable(); +#endif + return 0; +} + int checkboard(void) { printf("Board: i.MX31 MAX PDK (3DS)\n"); diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 86c758f..1f1de46 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -61,6 +61,7 @@ #define CONFIG_MXC_UART 1 #define CONFIG_SYS_MX31_UART1 1 +#define CONFIG_HW_WATCHDOG #define CONFIG_HARD_SPI 1 #define CONFIG_MXC_SPI 1 -- 1.6.0.4

4 6

[U-Boot] [PATCH v2 1/2] MX31: mx31pdk: Add watchdog support
by Fabio Estevam 27 Apr '11

27 Apr '11

Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - define BOARD_LATE_INIT in /mx31pdk.h board/freescale/mx31pdk/mx31pdk.c | 16 ++++++++++++++++ include/configs/mx31pdk.h | 3 +++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/board/freescale/mx31pdk/mx31pdk.c b/board/freescale/mx31pdk/mx31pdk.c index 3f291fc..4ef548f 100644 --- a/board/freescale/mx31pdk/mx31pdk.c +++ b/board/freescale/mx31pdk/mx31pdk.c @@ -28,9 +28,17 @@ #include <netdev.h> #include <asm/arch/clock.h> #include <asm/arch/imx-regs.h> +#include <watchdog.h> DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_HW_WATCHDOG +void hw_watchdog_reset(void) +{ + mxc_hw_watchdog_reset(); +} +#endif + int dram_init(void) { /* dram_init must store complete ramsize in gd->ram_size */ @@ -68,6 +76,14 @@ int board_init(void) return 0; } +int board_late_init(void) +{ +#ifdef CONFIG_HW_WATCHDOG + mxc_hw_watchdog_enable(); +#endif + return 0; +} + int checkboard(void) { printf("Board: i.MX31 MAX PDK (3DS)\n"); diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index d4c6d16..f5d3ee7 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -61,6 +61,7 @@ #define CONFIG_MXC_UART 1 #define CONFIG_SYS_MX31_UART1 1 +#define CONFIG_HW_WATCHDOG #define CONFIG_HARD_SPI 1 #define CONFIG_MXC_SPI 1 @@ -98,6 +99,8 @@ */ #undef CONFIG_CMD_IMLS +#define BOARD_LATE_INIT + #define CONFIG_BOOTDELAY 3 #define CONFIG_EXTRA_ENV_SETTINGS \ -- 1.6.0.4

3 4

[U-Boot] [PATCH V2] JFFS2: bug fix for summary support.
by Baidu Liu 27 Apr '11

27 Apr '11

This patch fixes some issues with JFFS2 summary support in U-Boot. 1/ Bug fix for summary support: we need to get the latest DIRENT. For example, if you create a file in linux jffs2 which config summary support, then you delete the file , you will not see the file in linux jffs2. But you can also see this file in uboot after you reset the system. That is because all the nodes in jffs2 which config summary will not be marked as obsolete. The deleted file's DIRENT node will be seen in uboot. So what we need to do is to get the latest DIRENT whose ino in DIRENT is 0. Than we will not see this file in uboot which is what we want. 2/ Add CONFIG_SYS_JFFS2_SORT_FRAGMENTS definition,if we config jffs2 summary in uboot. 3/ Avoid allocate too big memory if the biggest file in JFFS2 is too long. We only allocate one node size for pL->readbuf. For example, if the biggest file in the jffs2 is 15MB in the 16MB jffs2 system. Our previous code will allocate a buffer(pL->readbuf) as 15MB length. 4/ Improve error checking in the scanning. Signed-off-by: Baidu Liu <liucai.lfn(a)gmail.com> --- Changes for v2: - Add detail description for the patch. --- fs/jffs2/jffs2_1pass.c | 60 +++++++++++++++++++++++++----------------- fs/jffs2/jffs2_nand_1pass.c | 28 +++++++++++++++----- include/jffs2/jffs2.h | 10 +++++++ 3 files changed, 67 insertions(+), 31 deletions(-) diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index c4f7445..b3d94af 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -662,7 +662,8 @@ jffs2_free_cache(struct part_info *part) pL = (struct b_lists *)part->jffs2_priv; free_nodes(&pL->frag); free_nodes(&pL->dir); - free(pL->readbuf); + if(pL->readbuf) + free(pL->readbuf); free(pL); } } @@ -676,12 +677,18 @@ jffs_init_1pass_list(struct part_info *part) if (NULL != (part->jffs2_priv = malloc(sizeof(struct b_lists)))) { pL = (struct b_lists *)part->jffs2_priv; - memset(pL, 0, sizeof(*pL)); + + pL->readbuf = malloc(sizeof(union jffs2_node_union)); + if(!pL->readbuf) { + printf("jffs_init_1pass_list: malloc failed\n"); + return 0; + } #ifdef CONFIG_SYS_JFFS2_SORT_FRAGMENTS pL->dir.listCompare = compare_dirents; pL->frag.listCompare = compare_inodes; #endif + return 1; } return 0; } @@ -748,8 +755,8 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest) if(dest) { src = ((uchar *) jNode) + sizeof(struct jffs2_raw_inode); - /* ignore data behind latest known EOF */ - if (jNode->offset > totalSize) { + /* ignore data which exceed file length */ + if (jNode->offset + jNode->dsize > totalSize) { put_fl_mem(jNode, pL->readbuf); continue; } @@ -836,9 +843,8 @@ jffs2_1pass_find_inode(struct b_lists * pL, const char *name, u32 pino) jDir = (struct jffs2_raw_dirent *) get_node_mem(b->offset, pL->readbuf); if ((pino == jDir->pino) && (len == jDir->nsize) && - (jDir->ino) && /* 0 for unlink */ (!strncmp((char *)jDir->name, name, len))) { /* a match */ - if (jDir->version < version) { + if (jDir->version < version) { /*ignore the old DIRENT*/ put_fl_mem(jDir, pL->readbuf); continue; } @@ -962,6 +968,14 @@ jffs2_1pass_list_inodes(struct b_lists * pL, u32 pino) struct jffs2_raw_inode ojNode; struct jffs2_raw_inode *jNode, *i = NULL; struct b_node *b2 = pL->frag.listHead; + + /* + we compare the DIRENT's ino with the latest DIRENT's ino + to determine whether this DIRENT is the latest one. + If the DIRENT is not the latest one,ignore it. + */ + if(jDir->ino != jffs2_1pass_find_inode(pL, jDir->name, pino)) + continue; while (b2) { jNode = (struct jffs2_raw_inode *) @@ -1448,7 +1462,6 @@ jffs2_1pass_build_lists(struct part_info * part) u32 counter4 = 0; u32 counterF = 0; u32 counterN = 0; - u32 max_totlen = 0; u32 buf_size = DEFAULT_EMPTY_SCAN_SIZE; char *buf; @@ -1458,9 +1471,16 @@ jffs2_1pass_build_lists(struct part_info * part) /* lcd_off(); */ /* if we are building a list we need to refresh the cache. */ - jffs_init_1pass_list(part); + if(! jffs_init_1pass_list(part)) + return 0; + pL = (struct b_lists *)part->jffs2_priv; buf = malloc(buf_size); + if (!buf) { + printf("jffs2_1pass_build_lists: malloc failed\n"); + return 0; + } + puts ("Scanning JFFS2 FS: "); /* start at the beginning of the partition */ @@ -1520,7 +1540,7 @@ jffs2_1pass_build_lists(struct part_info * part) ret = jffs2_sum_scan_sumnode(part, sector_ofs, sumptr, sumlen, pL); - if (buf_size && sumlen > buf_size) + if (sumlen > buf_size) free(sumptr); if (ret < 0) { free(buf); @@ -1631,6 +1651,8 @@ jffs2_1pass_build_lists(struct part_info * part) case JFFS2_NODETYPE_INODE: if (buf_ofs + buf_len < ofs + sizeof(struct jffs2_raw_inode)) { + buf_len = min_t(uint32_t, buf_size, sector_ofs + + part->sector_size - ofs); get_fl_mem((u32)part->offset + ofs, buf_len, buf); buf_ofs = ofs; @@ -1645,15 +1667,13 @@ jffs2_1pass_build_lists(struct part_info * part) jffs2_free_cache(part); return 0; } - if (max_totlen < node->totlen) - max_totlen = node->totlen; break; case JFFS2_NODETYPE_DIRENT: - if (buf_ofs + buf_len < ofs + sizeof(struct - jffs2_raw_dirent) + - ((struct - jffs2_raw_dirent *) - node)->nsize) { + if (buf_ofs + buf_len < ofs + + sizeof(struct jffs2_raw_dirent) + + ((struct jffs2_raw_dirent *)node)->nsize) { + buf_len = min_t(uint32_t, buf_size, sector_ofs + + part->sector_size - ofs); get_fl_mem((u32)part->offset + ofs, buf_len, buf); buf_ofs = ofs; @@ -1675,8 +1695,6 @@ jffs2_1pass_build_lists(struct part_info * part) jffs2_free_cache(part); return 0; } - if (max_totlen < node->totlen) - max_totlen = node->totlen; counterN++; break; case JFFS2_NODETYPE_CLEANMARKER: @@ -1708,12 +1726,6 @@ jffs2_1pass_build_lists(struct part_info * part) free(buf); putstr("\b\b done.\r\n"); /* close off the dots */ - /* We don't care if malloc failed - then each read operation will - * allocate its own buffer as necessary (NAND) or will read directly - * from flash (NOR). - */ - pL->readbuf = malloc(max_totlen); - /* turn the lcd back on. */ /* splash(); */ diff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c index 3982003..285c269 100644 --- a/fs/jffs2/jffs2_nand_1pass.c +++ b/fs/jffs2/jffs2_nand_1pass.c @@ -251,6 +251,7 @@ jffs_init_1pass_list(struct part_info *part) pL->dir.listCompare = compare_dirents; pL->frag.listCompare = compare_inodes; #endif + return 1; } return 0; } @@ -305,8 +306,8 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 ino, char *dest, if (dest) len += jNode->csize; nand_read(nand, jNode->offset, &len, inode); - /* ignore data behind latest known EOF */ - if (inode->offset > totalSize) + /* ignore data which exceed file length */ + if (inode->offset + inode->dsize > totalSize) continue; if (stat) { @@ -371,8 +372,9 @@ jffs2_1pass_find_inode(struct b_lists * pL, const char *name, u32 pino) /* we need to search all and return the inode with the highest version */ for (jDir = (struct b_dirent *)pL->dir.listHead; jDir; jDir = jDir->next) { - if ((pino == jDir->pino) && (jDir->ino) && /* 0 for unlink */ - (len == jDir->nsize) && (nhash == jDir->nhash)) { + if ((pino == jDir->pino) && + (len == jDir->nsize) && + (nhash == jDir->nhash)) { /* TODO: compare name */ if (jDir->version < version) continue; @@ -483,6 +485,14 @@ jffs2_1pass_list_inodes(struct b_lists * pL, u32 pino) struct b_inode *jNode = (struct b_inode *)pL->frag.listHead; struct b_inode *i = NULL; + /* + we compare the DIRENT's ino with the latest DIRENT's ino + to determine whether this DIRENT is the latest one. + If the DIRENT is not the latest one,ignore it. + */ + if(jDir.ino != jffs2_1pass_find_inode(pL, jDir->name, pino)) + continue; + while (jNode) { if (jNode->ino == jDir->ino && jNode->version >= i_version) { i_version = jNode->version; @@ -797,7 +807,9 @@ jffs2_1pass_build_lists(struct part_info * part) nand = nand_info + id->num; /* if we are building a list we need to refresh the cache. */ - jffs_init_1pass_list(part); + if(! jffs_init_1pass_list(part)) + return 0; + pL = (struct b_lists *)part->jffs2_priv; pL->partOffset = part->offset; puts ("Scanning JFFS2 FS: "); @@ -809,6 +821,8 @@ jffs2_1pass_build_lists(struct part_info * part) return 0; for (i = 0; i < nr_blocks; i++) { + WATCHDOG_RESET(); + printf("\b\b%c ", spinner[counter++ % sizeof(spinner)]); offset = part->offset + i * sectorsize; @@ -878,6 +892,7 @@ jffs2_1pass_build_lists(struct part_info * part) } } + free(buf); putstr("\b\b done.\r\n"); /* close off the dots */ #if 0 @@ -896,8 +911,7 @@ jffs2_1pass_build_lists(struct part_info * part) #endif /* give visual feedback that we are done scanning the flash */ - led_blink(0x0, 0x0, 0x1, 0x1); /* off, forever, on 100ms, off 100ms */ - free(buf); + led_blink(0x0, 0x0, 0x1, 0x1); /* off, forever, on 100ms, off 100ms */ return 1; } diff --git a/include/jffs2/jffs2.h b/include/jffs2/jffs2.h index 651f94c..5b006c0 100644 --- a/include/jffs2/jffs2.h +++ b/include/jffs2/jffs2.h @@ -41,6 +41,16 @@ #include <asm/types.h> #include <jffs2/load_kernel.h> +#ifdef CONFIG_JFFS2_SUMMARY +#ifndef CONFIG_SYS_JFFS2_SORT_FRAGMENTS +/* +we should define CONFIG_SYS_JFFS2_SORT_FRAGMENTS,if +CONFIG_JFFS2_SUMMARY is enabled. +*/ +#define CONFIG_SYS_JFFS2_SORT_FRAGMENTS +#endif +#endif + #define JFFS2_SUPER_MAGIC 0x72b6 /* Values we may expect to find in the 'magic' field */ -- 1.7.3.1.msysgit.0

2 3

[U-Boot] [PATCH,V2] JFFS2: accelerate scanning.
by Baidu Liu 27 Apr '11

27 Apr '11

Syncs up with jffs2 in the linux kernel: 1/ Change DEFAULT_EMPTY_SCAN_SIZE from 4KB to 256 Bytes. 2/ If the 1KB data is 0xFF after the cleanmarker, skip and scan the next sector. 3/ Change the buffer size from 4KB to 128KB which is the common size of erase block. For the 16MB nor flash, the scanning time is accelerated from about 9s to 1s. Signed-off-by: Baidu Liu <liucai.lfn(a)gmail.com> --- Changes for V2: - Add detail description for the patch. - Move DEFAULT_EMPTY_SCAN_SIZE to jffs2.h --- fs/jffs2/jffs2_1pass.c | 30 +++++++++++++++++++----------- fs/jffs2/jffs2_nand_1pass.c | 11 +++++------ include/jffs2/jffs2.h | 2 ++ 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 5ddc2b9..2077d2f 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -1428,8 +1428,6 @@ dump_dirents(struct b_lists *pL) } #endif -#define DEFAULT_EMPTY_SCAN_SIZE 4096 - static inline uint32_t EMPTY_SCAN_SIZE(uint32_t sector_size) { if (sector_size < DEFAULT_EMPTY_SCAN_SIZE) @@ -1449,7 +1447,7 @@ jffs2_1pass_build_lists(struct part_info * part) u32 counterF = 0; u32 counterN = 0; u32 max_totlen = 0; - u32 buf_size = DEFAULT_EMPTY_SCAN_SIZE; + u32 buf_size = 128*1024; char *buf; /* turn off the lcd. Refreshing the lcd adds 50% overhead to the */ @@ -1540,14 +1538,17 @@ jffs2_1pass_build_lists(struct part_info * part) /* We temporarily use 'ofs' as a pointer into the buffer/jeb */ ofs = 0; - /* Scan only 4KiB of 0xFF before declaring it's empty */ + /* Scan only EMPTY_SCAN_SIZE of 0xFF before declaring it's empty */ while (ofs < EMPTY_SCAN_SIZE(part->sector_size) && *(uint32_t *)(&buf[ofs]) == 0xFFFFFFFF) ofs += 4; - if (ofs == EMPTY_SCAN_SIZE(part->sector_size)) + if (ofs == EMPTY_SCAN_SIZE(part->sector_size)) { + printf("Block at 0x%08x is empty (erased)\n", sector_ofs); continue; + } + /* Now ofs is a complete physical flash offset as it always was... */ ofs += sector_ofs; prevofs = ofs - 1; @@ -1575,16 +1576,14 @@ jffs2_1pass_build_lists(struct part_info * part) if (*(uint32_t *)(&buf[ofs-buf_ofs]) == 0xffffffff) { uint32_t inbuf_ofs; - uint32_t empty_start, scan_end; + uint32_t empty_start; empty_start = ofs; ofs += 4; - scan_end = min_t(uint32_t, EMPTY_SCAN_SIZE( - part->sector_size)/8, - buf_len); + more_empty: inbuf_ofs = ofs - buf_ofs; - while (inbuf_ofs < scan_end) { + while (inbuf_ofs < buf_len) { if (*(uint32_t *)(&buf[inbuf_ofs]) != 0xffffffff) goto scan_more; @@ -1594,6 +1593,15 @@ jffs2_1pass_build_lists(struct part_info * part) } /* Ran off end. */ + /* If we're only checking the beginning of a block with a cleanmarker, + bail now */ + if((buf_ofs == sector_ofs) && + (empty_start == sector_ofs +sizeof(struct jffs2_unknown_node))) { + printf("%d bytes at start of block seems clean... assuming all clean\n", + EMPTY_SCAN_SIZE(part->sector_size)); + break; + } + /* See how much more there is to read in this * eraseblock... */ @@ -1608,12 +1616,12 @@ jffs2_1pass_build_lists(struct part_info * part) */ break; } - scan_end = buf_len; get_fl_mem((u32)part->offset + ofs, buf_len, buf); buf_ofs = ofs; goto more_empty; } + if (node->magic != JFFS2_MAGIC_BITMASK || !hdr_crc(node)) { ofs += 4; diff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c index 740f787..6d205c1 100644 --- a/fs/jffs2/jffs2_nand_1pass.c +++ b/fs/jffs2/jffs2_nand_1pass.c @@ -779,7 +779,6 @@ jffs2_fill_scan_buf(nand_info_t *nand, unsigned char *buf, return 0; } -#define EMPTY_SCAN_SIZE 1024 static u32 jffs2_1pass_build_lists(struct part_info * part) { @@ -816,17 +815,17 @@ jffs2_1pass_build_lists(struct part_info * part) if (nand_block_isbad(nand, offset)) continue; - if (jffs2_fill_scan_buf(nand, buf, offset, EMPTY_SCAN_SIZE)) + if (jffs2_fill_scan_buf(nand, buf, offset, DEFAULT_EMPTY_SCAN_SIZE)) return 0; ofs = 0; - /* Scan only 4KiB of 0xFF before declaring it's empty */ - while (ofs < EMPTY_SCAN_SIZE && *(uint32_t *)(&buf[ofs]) == 0xFFFFFFFF) + /* Scan only DEFAULT_EMPTY_SCAN_SIZE of 0xFF before declaring it's empty */ + while (ofs < DEFAULT_EMPTY_SCAN_SIZE && *(uint32_t *)(&buf[ofs]) == 0xFFFFFFFF) ofs += 4; - if (ofs == EMPTY_SCAN_SIZE) + if (ofs == DEFAULT_EMPTY_SCAN_SIZE) continue; - if (jffs2_fill_scan_buf(nand, buf + EMPTY_SCAN_SIZE, offset + EMPTY_SCAN_SIZE, sectorsize - EMPTY_SCAN_SIZE)) + if (jffs2_fill_scan_buf(nand, buf + DEFAULT_EMPTY_SCAN_SIZE, offset + DEFAULT_EMPTY_SCAN_SIZE, sectorsize - DEFAULT_EMPTY_SCAN_SIZE)) return 0; offset += ofs; diff --git a/include/jffs2/jffs2.h b/include/jffs2/jffs2.h index 651f94c..75c68b8 100644 --- a/include/jffs2/jffs2.h +++ b/include/jffs2/jffs2.h @@ -41,6 +41,8 @@ #include <asm/types.h> #include <jffs2/load_kernel.h> +#define DEFAULT_EMPTY_SCAN_SIZE 256 + #define JFFS2_SUPER_MAGIC 0x72b6 /* Values we may expect to find in the 'magic' field */ -- 1.7.3.1.msysgit.0

2 3