January 2014 - U-Boot

[U-Boot] [PATCH 1/2] ext4fs: use EXT2_BLOCK_SIZE instead of fs->blksz
by Ionut Nicu 20 Jan '14

20 Jan '14

Using fs->blksz in ext4fs_get_extent_block() is not correct since fs->blksz is not initialized on the read path. Use EXT2_BLOCK_SIZE() instead which will produce the desired output. Signed-off-by: Ionut Nicu <ioan.nicu.ext(a)nsn.com> Signed-off-by: Mathias Rulf <mathias.rulf(a)nsn.com> --- fs/ext4/ext4_common.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 352943e..37b6c46 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -1414,7 +1414,7 @@ static struct ext4_extent_header *ext4fs_get_extent_block { struct ext4_extent_idx *index; unsigned long long block; - struct ext_filesystem *fs = get_fs(); + int blksz = EXT2_BLOCK_SIZE(data); int i; while (1) { @@ -1438,7 +1438,7 @@ static struct ext4_extent_header *ext4fs_get_extent_block block = le16_to_cpu(index[i].ei_leaf_hi); block = (block << 32) + le32_to_cpu(index[i].ei_leaf_lo); - if (ext4fs_devread((lbaint_t)block << log2_blksz, 0, fs->blksz, + if (ext4fs_devread((lbaint_t)block << log2_blksz, 0, blksz, buf)) ext_block = (struct ext4_extent_header *)buf; else -- 1.7.1

2 1

[U-Boot] [PATCH] fs/ext4: fix calling put_ext4 with truncated offset
by Ma Haijun 20 Jan '14

20 Jan '14

Curently, we are using 32 bit multiplication to calculate the offset, so the result will always be 32 bit. This can silently cause file system corruption when performing a write operation on partition larger than 4 GiB. This patch address the issue by simply promoting the terms to 64 bit, and let compilers decide how to do the multiplication efficiently. Signed-off-by: Ma Haijun <mahaijuns(a)gmail.com> --- fs/ext4/ext4_common.c | 34 +++++++++++++++++----------------- fs/ext4/ext4_journal.c | 8 ++++---- fs/ext4/ext4_write.c | 14 +++++++------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 352943e..cff50d8 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -445,9 +445,9 @@ restart: goto fail; } put_ext4(((uint64_t) - (g_parent_inode->b. + ((uint64_t)g_parent_inode->b. blocks.dir_blocks[direct_blk_idx] * - fs->blksz)), zero_buffer, fs->blksz); + (uint64_t)fs->blksz)), zero_buffer, fs->blksz); g_parent_inode->size = g_parent_inode->size + fs->blksz; g_parent_inode->blockcnt = @@ -864,8 +864,8 @@ long int ext4fs_get_new_blk_no(void) for (i = 0; i < fs->no_blkgrp; i++) { if (bgd[i].free_blocks) { if (bgd[i].bg_flags & EXT4_BG_BLOCK_UNINIT) { - put_ext4(((uint64_t) (bgd[i].block_id * - fs->blksz)), + put_ext4(((uint64_t) ((uint64_t)bgd[i].block_id * + (uint64_t)fs->blksz)), zero_buffer, fs->blksz); bgd[i].bg_flags = bgd[i]. @@ -929,8 +929,8 @@ restart: if (bgd[bg_idx].bg_flags & EXT4_BG_BLOCK_UNINIT) { memset(zero_buffer, '\0', fs->blksz); - put_ext4(((uint64_t) (bgd[bg_idx].block_id * - fs->blksz)), zero_buffer, fs->blksz); + put_ext4(((uint64_t) ((uint64_t)bgd[bg_idx].block_id * + (uint64_t)fs->blksz)), zero_buffer, fs->blksz); memcpy(fs->blk_bmaps[bg_idx], zero_buffer, fs->blksz); bgd[bg_idx].bg_flags = bgd[bg_idx].bg_flags & ~EXT4_BG_BLOCK_UNINIT; @@ -996,8 +996,8 @@ int ext4fs_get_new_inode_no(void) bgd[i].free_inodes; if (bgd[i].bg_flags & EXT4_BG_INODE_UNINIT) { put_ext4(((uint64_t) - (bgd[i].inode_id * - fs->blksz)), + ((uint64_t)bgd[i].inode_id * + (uint64_t)fs->blksz)), zero_buffer, fs->blksz); bgd[i].bg_flags = bgd[i].bg_flags & ~EXT4_BG_INODE_UNINIT; @@ -1037,8 +1037,8 @@ restart: ibmap_idx = fs->curr_inode_no / inodes_per_grp; if (bgd[ibmap_idx].bg_flags & EXT4_BG_INODE_UNINIT) { memset(zero_buffer, '\0', fs->blksz); - put_ext4(((uint64_t) (bgd[ibmap_idx].inode_id * - fs->blksz)), zero_buffer, + put_ext4(((uint64_t) ((uint64_t)bgd[ibmap_idx].inode_id * + (uint64_t)fs->blksz)), zero_buffer, fs->blksz); bgd[ibmap_idx].bg_flags = bgd[ibmap_idx].bg_flags & ~EXT4_BG_INODE_UNINIT; @@ -1143,7 +1143,7 @@ static void alloc_single_indirect_block(struct ext2_inode *file_inode, } /* write the block to disk */ - put_ext4(((uint64_t) (si_blockno * fs->blksz)), + put_ext4(((uint64_t) ((uint64_t)si_blockno * (uint64_t)fs->blksz)), si_start_addr, fs->blksz); file_inode->b.blocks.indir_block = si_blockno; } @@ -1242,7 +1242,7 @@ static void alloc_double_indirect_block(struct ext2_inode *file_inode, break; } /* write the block table */ - put_ext4(((uint64_t) (di_blockno_child * fs->blksz)), + put_ext4(((uint64_t) ((uint64_t)di_blockno_child * (uint64_t)fs->blksz)), di_child_buff_start, fs->blksz); free(di_child_buff_start); di_child_buff_start = NULL; @@ -1250,7 +1250,7 @@ static void alloc_double_indirect_block(struct ext2_inode *file_inode, if (*total_remaining_blocks == 0) break; } - put_ext4(((uint64_t) (di_blockno_parent * fs->blksz)), + put_ext4(((uint64_t) ((uint64_t)di_blockno_parent * (uint64_t)fs->blksz)), di_block_start_addr, fs->blksz); file_inode->b.blocks.double_indir_block = di_blockno_parent; } @@ -1348,8 +1348,8 @@ static void alloc_triple_indirect_block(struct ext2_inode *file_inode, break; } /* write the child block */ - put_ext4(((uint64_t) (ti_child_blockno * - fs->blksz)), + put_ext4(((uint64_t) ((uint64_t)ti_child_blockno * + (uint64_t)fs->blksz)), ti_cbuff_start_addr, fs->blksz); free(ti_cbuff_start_addr); @@ -1357,7 +1357,7 @@ static void alloc_triple_indirect_block(struct ext2_inode *file_inode, break; } /* write the parent block */ - put_ext4(((uint64_t) (ti_parent_blockno * fs->blksz)), + put_ext4(((uint64_t) ((uint64_t)ti_parent_blockno * (uint64_t)fs->blksz)), ti_pbuff_start_addr, fs->blksz); free(ti_pbuff_start_addr); @@ -1365,7 +1365,7 @@ static void alloc_triple_indirect_block(struct ext2_inode *file_inode, break; } /* write the grand parent block */ - put_ext4(((uint64_t) (ti_gp_blockno * fs->blksz)), + put_ext4(((uint64_t) ((uint64_t)ti_gp_blockno * (uint64_t)fs->blksz)), ti_gp_buff_start_addr, fs->blksz); file_inode->b.blocks.triple_indir_block = ti_gp_blockno; } diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c index d4a46ed..3f61335 100644 --- a/fs/ext4/ext4_journal.c +++ b/fs/ext4/ext4_journal.c @@ -371,7 +371,7 @@ void recover_transaction(int prev_desc_logical_no) blknr = read_allocated_block(&inode_journal, i); ext4fs_devread((lbaint_t)blknr * fs->sect_perblk, 0, fs->blksz, metadata_buff); - put_ext4((uint64_t)(be32_to_cpu(tag->block) * fs->blksz), + put_ext4((uint64_t)((uint64_t)be32_to_cpu(tag->block) * (uint64_t)fs->blksz), metadata_buff, (uint32_t) fs->blksz); } while (!(flags & EXT3_JOURNAL_FLAG_LAST_TAG)); fail: @@ -531,7 +531,7 @@ end: blknr = read_allocated_block(&inode_journal, EXT2_JOURNAL_SUPERBLOCK); - put_ext4((uint64_t) (blknr * fs->blksz), + put_ext4((uint64_t) ((uint64_t)blknr * (uint64_t)fs->blksz), (struct journal_superblock_t *)temp_buff, (uint32_t) fs->blksz); ext4fs_free_revoke_blks(); @@ -590,7 +590,7 @@ static void update_descriptor_block(long int blknr) tag.flags = cpu_to_be32(EXT3_JOURNAL_FLAG_LAST_TAG); memcpy(temp - sizeof(struct ext3_journal_block_tag), &tag, sizeof(struct ext3_journal_block_tag)); - put_ext4((uint64_t) (blknr * fs->blksz), buf, (uint32_t) fs->blksz); + put_ext4((uint64_t) ((uint64_t)blknr * (uint64_t)fs->blksz), buf, (uint32_t) fs->blksz); free(temp_buff); free(buf); @@ -625,7 +625,7 @@ static void update_commit_block(long int blknr) return; } memcpy(buf, &jdb, sizeof(struct journal_header_t)); - put_ext4((uint64_t) (blknr * fs->blksz), buf, (uint32_t) fs->blksz); + put_ext4((uint64_t) ((uint64_t)blknr * (uint64_t)fs->blksz), buf, (uint32_t) fs->blksz); free(temp_buff); free(buf); diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c index 1e1924c..b674b6f 100644 --- a/fs/ext4/ext4_write.c +++ b/fs/ext4/ext4_write.c @@ -40,18 +40,18 @@ static void ext4fs_update(void) /* update block groups */ for (i = 0; i < fs->no_blkgrp; i++) { fs->bgd[i].bg_checksum = ext4fs_checksum_update(i); - put_ext4((uint64_t)(fs->bgd[i].block_id * fs->blksz), + put_ext4((uint64_t)((uint64_t)fs->bgd[i].block_id * (uint64_t)fs->blksz), fs->blk_bmaps[i], fs->blksz); } /* update inode table groups */ for (i = 0; i < fs->no_blkgrp; i++) { - put_ext4((uint64_t) (fs->bgd[i].inode_id * fs->blksz), + put_ext4((uint64_t) ((uint64_t)fs->bgd[i].inode_id * (uint64_t)fs->blksz), fs->inode_bmaps[i], fs->blksz); } /* update the block group descriptor table */ - put_ext4((uint64_t)(fs->gdtable_blkno * fs->blksz), + put_ext4((uint64_t)((uint64_t)fs->gdtable_blkno * (uint64_t)fs->blksz), (struct ext2_block_group *)fs->gdtable, (fs->blksz * fs->no_blk_pergdt)); @@ -709,7 +709,7 @@ void ext4fs_deinit(void) temp_buff); jsb = (struct journal_superblock_t *)temp_buff; jsb->s_start = cpu_to_be32(0); - put_ext4((uint64_t) (blknr * fs->blksz), + put_ext4((uint64_t) ((uint64_t)blknr * (uint64_t)fs->blksz), (struct journal_superblock_t *)temp_buff, fs->blksz); free(temp_buff); } @@ -793,7 +793,7 @@ static int ext4fs_write_file(struct ext2_inode *file_inode, delayed_next += blockend >> log2blksz; } else { /* spill */ put_ext4((uint64_t) - (delayed_start << log2blksz), + ((uint64_t)delayed_start << log2blksz), delayed_buf, (uint32_t) delayed_extent); previous_block_number = blknr; @@ -814,7 +814,7 @@ static int ext4fs_write_file(struct ext2_inode *file_inode, } else { if (previous_block_number != -1) { /* spill */ - put_ext4((uint64_t) (delayed_start << + put_ext4((uint64_t) ((uint64_t)delayed_start << log2blksz), delayed_buf, (uint32_t) delayed_extent); @@ -826,7 +826,7 @@ static int ext4fs_write_file(struct ext2_inode *file_inode, } if (previous_block_number != -1) { /* spill */ - put_ext4((uint64_t) (delayed_start << log2blksz), + put_ext4((uint64_t) ((uint64_t)delayed_start << log2blksz), delayed_buf, (uint32_t) delayed_extent); previous_block_number = -1; } -- 1.8.3.2

2 1

[U-Boot] [PATCH] fs/ext4: fix partition size get truncated in calculation
by Ma Haijun 20 Jan '14

20 Jan '14

It may cause file system corruption when do a write operation. This issue only affects boards that use 32 bit lbaint_t. Signed-off-by: Ma Haijun <mahaijuns(a)gmail.com> --- fs/ext4/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/dev.c b/fs/ext4/dev.c index 787e041..e0b513a 100644 --- a/fs/ext4/dev.c +++ b/fs/ext4/dev.c @@ -41,7 +41,7 @@ void ext4fs_set_blk_dev(block_dev_desc_t *rbdd, disk_partition_t *info) get_fs()->dev_desc = rbdd; part_info = info; part_offset = info->start; - get_fs()->total_sect = (info->size * info->blksz) >> + get_fs()->total_sect = ((uint64_t)info->size * info->blksz) >> get_fs()->dev_desc->log2blksz; } -- 1.8.3.2

2 1

[U-Boot] [PATCH REPOST4 1/2] ARM: rpi_b: power on SDHCI and USB HW modules
by Stephen Warren 20 Jan '14

20 Jan '14

Send RPC commands to the VideoCore to turn on the SDHCI and USB modules. For SDHCI this isn't needed in practice, since the firmware already turned on the power in order to load U-Boot. However, it's best to be explicit. For USB, this is necessary, since the module isn't powered otherwise. This will allow the kernel USB driver to work. Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- Could this please be applied for v2014.01? I know I did first post it after the merge window closed (by just a few hours...) but there's always plenty of other stuff that's accepted under similar timing. arch/arm/include/asm/arch-bcm2835/mbox.h | 48 ++++++++++++++++++++++++++++++++ board/raspberrypi/rpi_b/rpi_b.c | 34 +++++++++++++++++++++- 2 files changed, 81 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-bcm2835/mbox.h b/arch/arm/include/asm/arch-bcm2835/mbox.h index 6b806ec..38cb42a 100644 --- a/arch/arm/include/asm/arch-bcm2835/mbox.h +++ b/arch/arm/include/asm/arch-bcm2835/mbox.h @@ -133,6 +133,54 @@ struct bcm2835_mbox_tag_get_arm_mem { } body; }; +#define BCM2835_MBOX_POWER_DEVID_SDHCI 0 +#define BCM2835_MBOX_POWER_DEVID_UART0 1 +#define BCM2835_MBOX_POWER_DEVID_UART1 2 +#define BCM2835_MBOX_POWER_DEVID_USB_HCD 3 +#define BCM2835_MBOX_POWER_DEVID_I2C0 4 +#define BCM2835_MBOX_POWER_DEVID_I2C1 5 +#define BCM2835_MBOX_POWER_DEVID_I2C2 6 +#define BCM2835_MBOX_POWER_DEVID_SPI 7 +#define BCM2835_MBOX_POWER_DEVID_CCP2TX 8 + +#define BCM2835_MBOX_POWER_STATE_RESP_ON (1 << 1) +/* Device doesn't exist */ +#define BCM2835_MBOX_POWER_STATE_RESP_NODEV (1 << 1) + +#define BCM2835_MBOX_TAG_GET_POWER_STATE 0x00020001 + +struct bcm2835_mbox_tag_get_power_state { + struct bcm2835_mbox_tag_hdr tag_hdr; + union { + struct { + u32 device_id; + } req; + struct { + u32 device_id; + u32 state; + } resp; + } body; +}; + +#define BCM2835_MBOX_TAG_SET_POWER_STATE 0x00028001 + +#define BCM2835_MBOX_SET_POWER_STATE_REQ_ON (1 << 0) +#define BCM2835_MBOX_SET_POWER_STATE_REQ_WAIT (1 << 1) + +struct bcm2835_mbox_tag_set_power_state { + struct bcm2835_mbox_tag_hdr tag_hdr; + union { + struct { + u32 device_id; + u32 state; + } req; + struct { + u32 device_id; + u32 state; + } resp; + } body; +}; + #define BCM2835_MBOX_TAG_GET_CLOCK_RATE 0x00030002 #define BCM2835_MBOX_CLOCK_ID_EMMC 1 diff --git a/board/raspberrypi/rpi_b/rpi_b.c b/board/raspberrypi/rpi_b/rpi_b.c index 16d442a..f33fae9 100644 --- a/board/raspberrypi/rpi_b/rpi_b.c +++ b/board/raspberrypi/rpi_b/rpi_b.c @@ -29,6 +29,12 @@ struct msg_get_arm_mem { u32 end_tag; }; +struct msg_set_power_state { + struct bcm2835_mbox_hdr hdr; + struct bcm2835_mbox_tag_set_power_state set_power_state; + u32 end_tag; +}; + struct msg_get_clock_rate { struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_tag_get_clock_rate get_clock_rate; @@ -54,11 +60,35 @@ int dram_init(void) return 0; } +static int power_on_module(u32 module) +{ + ALLOC_ALIGN_BUFFER(struct msg_set_power_state, msg_pwr, 1, 16); + int ret; + + BCM2835_MBOX_INIT_HDR(msg_pwr); + BCM2835_MBOX_INIT_TAG(&msg_pwr->set_power_state, + SET_POWER_STATE); + msg_pwr->set_power_state.body.req.device_id = module; + msg_pwr->set_power_state.body.req.state = + BCM2835_MBOX_SET_POWER_STATE_REQ_ON | + BCM2835_MBOX_SET_POWER_STATE_REQ_WAIT; + + ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, + &msg_pwr->hdr); + if (ret) { + printf("bcm2835: Could not set module %u power state\n", + module); + return -1; + } + + return 0; +} + int board_init(void) { gd->bd->bi_boot_params = 0x100; - return 0; + return power_on_module(BCM2835_MBOX_POWER_DEVID_USB_HCD); } int board_mmc_init(void) @@ -66,6 +96,8 @@ int board_mmc_init(void) ALLOC_ALIGN_BUFFER(struct msg_get_clock_rate, msg_clk, 1, 16); int ret; + power_on_module(BCM2835_MBOX_POWER_DEVID_SDHCI); + BCM2835_MBOX_INIT_HDR(msg_clk); BCM2835_MBOX_INIT_TAG(&msg_clk->get_clock_rate, GET_CLOCK_RATE); msg_clk->get_clock_rate.body.req.clock_id = BCM2835_MBOX_CLOCK_ID_EMMC; -- 1.8.3.2

3 5

[U-Boot] [i2c] Pull request
by Heiko Schocher 20 Jan '14

20 Jan '14

Hello Tom, please pull some small fixes from u-boot-i2c.git Thanks! The following changes since commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca: Merge branch 'master' of git://git.denx.de/u-boot-arm (2014-01-10 10:56:00 -0500) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to 8e0b3c020057b3f7345b6696029a80eaf162e7f3: i2c: zynq: Add support for the second i2c controller (2014-01-13 09:06:08 +0100) ---------------------------------------------------------------- Alexey Brodkin (2): env_eeprom - fix bus recovery for "eeprom_bus_read" drivers/designware_i2c - add suppor of CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW Darwin Rambo (1): i2c: Fix i2c speed command Hisashi Nakamura (1): rcar_i2c: Fix receiving wait condition Kuo-Jung Su (1): i2c: fti2c010: fix compiler warning on paddr[] Michael Burr (2): i2c: zynq: Support for 0-length register address i2c: zynq: Add support for the second i2c controller Nobuhiro Iwamatsu (1): rcar_i2c: Clear status before start master receive common/env_eeprom.c | 5 ++--- drivers/i2c/designware_i2c.c | 38 ++++++++++++++++++++++++++++++++++++++ drivers/i2c/fti2c010.c | 4 ++-- drivers/i2c/i2c_core.c | 2 +- drivers/i2c/rcar_i2c.c | 6 ++++-- drivers/i2c/zynq_i2c.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------- include/configs/zynq-common.h | 5 ++--- include/configs/zynq_zc70x.h | 2 +- 8 files changed, 103 insertions(+), 38 deletions(-) bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

4 5

[U-Boot] [PULL] : Please pull u-boot-imx
by Stefano Babic 20 Jan '14

20 Jan '14

Hi Albert, Commit 022298278 (mx6: soc: Disable VDDPU regulator) does not let boot kernel with enabled GPU (i.MX6). It is unclear at the moment if the fix should be done in U-Boot or in kernel, so it is better to revert it for the release. Please pull from u-boot-imx, thanks ! The following changes since commit 3a21773129f6ef218f1978d05a1a5d5cf6801ab6: mx6: Add initial support for the Hummingboard solo (2014-01-15 10:33:25 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to be2a3bb39adf1fdd274fc427e30ef62eb86441a1: mx6: Revert "mx6: soc: Disable VDDPU regulator" (2014-01-17 10:16:48 +0100) ---------------------------------------------------------------- Fabio Estevam (1): mx6: Revert "mx6: soc: Disable VDDPU regulator" arch/arm/cpu/armv7/mx6/soc.c | 41 ------------------------------ arch/arm/include/asm/arch-mx6/crm_regs.h | 1 - arch/arm/include/asm/arch-mx6/imx-regs.h | 23 ----------------- 3 files changed, 65 deletions(-) Regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

4 4

[U-Boot] Help
by Moon Moon 20 Jan '14

20 Jan '14

Hello Sir, I have a development board smdk6400.When i switch on my power my lcd shows only white colour.and nothing boot please help me. Thanks, Raheel

2 1

[U-Boot] Pull request: u-boot-spi/master
by Jagannadha Sutradharudu Teki 20 Jan '14

20 Jan '14

Hi Tom, SF code optimized stuff and few fixes. -- Thanks, Jagan. The following changes since commit 5c9038b6af1a93410af966999638eabb81efcd0f: omap3_beagle: use omap3-beagle.dtb for the C4 revision (2014-01-17 11:03:04 -0500) are available in the git repository at: git://git.denx.de/u-boot-spi.git master for you to fetch changes up to 83ba605953162443b054d5ad60535468b46558bd: sf: Update bank configuration (2014-01-20 22:30:35 +0530) ---------------------------------------------------------------- Jagannadha Sutradharudu Teki (5): sf: ops: Squash the malloc+memset combo sf: Optimize flash features code sf: Use mode_bits for dual_flash connection doc: SPI: Update the dual_flash info sf: Update bank configuration Marek Vasut (3): sf: Squash the malloc+memset combo sf: Fix entries for S25FL256S_256K and S25FL512S_256K sf: Add S25FL128S_256K IDs doc/SPI/README.dual-flash | 5 +- doc/SPI/README.sf-features | 125 ++++++++++++++++++++++++++++++ drivers/mtd/spi/sf.c | 4 +- drivers/mtd/spi/sf_internal.h | 1 - drivers/mtd/spi/sf_ops.c | 16 ++-- drivers/mtd/spi/sf_params.c | 171 +++++++++++++++++++++--------------------- drivers/mtd/spi/sf_probe.c | 104 ++++++++++++------------- include/spi.h | 42 ++++------- include/spi_flash.h | 24 +++--- 9 files changed, 301 insertions(+), 191 deletions(-) create mode 100644 doc/SPI/README.sf-features

3 2

[U-Boot] booting os 'Unknown OS' (1) is not supported
by Alexander Khryukin 20 Jan '14

20 Jan '14

Hello guys! I faced with a strange behaviour of u-boot. Few months ago i bought an ARM development board from yicsystem it's based on exynos 5250 and very similar to arndale http://www.yicsystem.com/products/low-cost-board/yse5250/ And i can boot Android ICS but when i try to boot any linux i always see Checking Boot Mode ... SDMMC Now running in RAM - U-Boot at: c3e00000 REVISION: 1.0 REVISION: 1.0 MMC Device 0: 3839 MB NAME: S5P_MSHC0 MMC Device 1: 7348 MB MMC Device 2 not found Destroy Hash Table: c3f80f78 table = (null) Create Hash Table: N=512 INSERT: table c3f80f78, filled 1/521 rv c3d047a0 ==> name="baudrate" value="115200" INSERT: table c3f80f78, filled 2/521 rv c3d0582c ==> name="bootargs" value="root=/dev/mmcblk0p1" INSERT: table c3f80f78, filled 3/521 rv c3d04a1c ==> name="bootcmd" value="movi read kernel 0 40008000;movi read rootfs 0 41000000 100000;bootm 40008000 41000000" INSERT: table c3f80f78, filled 4/521 rv c3d04f20 ==> name="bootdelay" value="3" INSERT: table c3f80f78, filled 5/521 rv c3d04bfc ==> name="bootfile" value="/tftpboot/revoboot/bin/revoboot.pxe" INSERT: table c3f80f78, filled 6/521 rv c3d040a4 ==> name="emmcbootrecovery" value="mmc erase boot 1 0 0;emmc open 1;movi read fwbl1 0 40000000;movi write zero fwbl1 1 40000000;movi read bl2 0 40004000;movi write zero bl2 1 40004000;movi read u-boot 0 42000000;movi write zero u-boot 1 42000000;movi read tzsw 0 42100000;movi write zero tzsw 1 42100000;emmc close 1" INSERT: table c3f80f78, filled 7/521 rv c3d04998 ==> name="ethact" value="smc911x-0" INSERT: table c3f80f78, filled 8/521 rv c3d0462c ==> name="ethaddr" value="00:40:5c:26:0a:5b" INSERT: table c3f80f78, filled 9/521 rv c3d057a8 ==> name="gatewayip" value="192.168.0.1" INSERT: table c3f80f78, filled 10/521 rv c3d05874 ==> name="ipaddr" value="192.168.0.28" INSERT: table c3f80f78, filled 11/521 rv c3d048c0 ==> name="netmask" value="255.255.255.0" INSERT: table c3f80f78, filled 12/521 rv c3d05214 ==> name="rootfslen" value=" 100000" INSERT: table c3f80f78, filled 13/521 rv c3d048e4 ==> name="serverip" value="192.168.0.13" INSERT: free(data = c3d00010) INSERT: done Net: smc911x-0 ### main_loop entered: bootdelay=3 ### main_loop: bootcmd="movi read kernel 0 40008000;movi read rootfs 0 41000000 100000;bootm 40008000 41000000" Hit any key to stop autoboot: 0 reading kernel..device 0 Start 1063, Count 16384 MMC read: dev # 0, block # 1063, count 16384 ... 16384 blocks read: OK completed reading RFS..device 0 Count 17447, Start 2048 MMC read: dev # 0, block # 17447, count 2048 ... 2048 blocks read: OK completed ## Current stack ends at 0xc3cfbd98 * kernel: cmdline image address = 0x40008000 ## Booting kernel from Legacy Image at 40008000 ... Image Name: Linux-3.12.0-rc1-armv7-x0.6-0012 Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 3243400 Bytes = 3167 KiB Load Address: 40008000 Entry Point: 40008000 Verifying Checksum ... OK kernel data at 0x40008040, len = 0x00317d88 (3243400) * ramdisk: cmdline image address = 0x41000000 Wrong Ramdisk Image Format ramdisk start = 0x41000000, ramdisk end = 0x41000000 XIP Kernel Image ... OK OK kernel loaded at 0x40008000, end = 0x4031fd88 images.os.start = 0x40008000, images.os.end = 0x4031fdc8 images.os.load = 0x40008000, load_end = 0x4031fd88 *ERROR: booting os 'Unknown OS' (1) is not supported* Unknown OS. But i do not understand what i should change to proceed. Any suggestions?

4 21

[U-Boot] [PATCH] Revert "fdt_support: 64bit initrd start address support"
by Otavio Salvador 20 Jan '14

20 Jan '14

This reverts commit f77a606a0602be5d1fe23e8dcdfa5defde51dfd7 as it breaks 32bit initrd use as it uses #address-cells as '2'. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- common/fdt_support.c | 66 +++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index b9dce99..4e32b02 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -21,34 +21,6 @@ */ DECLARE_GLOBAL_DATA_PTR; -/* - * Get cells len in bytes - * if #NNNN-cells property is 2 then len is 8 - * otherwise len is 4 - */ -static int get_cells_len(void *blob, char *nr_cells_name) -{ - const fdt32_t *cell; - - cell = fdt_getprop(blob, 0, nr_cells_name, NULL); - if (cell && fdt32_to_cpu(*cell) == 2) - return 8; - - return 4; -} - -/* - * Write a 4 or 8 byte big endian cell - */ -static void write_cell(u8 *addr, u64 val, int size) -{ - int shift = (size - 1) * 8; - while (size-- > 0) { - *addr++ = (val >> shift) & 0xff; - shift -= 8; - } -} - /** * fdt_getprop_u32_default - Find a node and return it's property or a default * @@ -159,9 +131,9 @@ static int fdt_fixup_stdout(void *fdt, int chosenoff) int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end, int force) { - int nodeoffset, addr_cell_len; + int nodeoffset; int err, j, total; - fdt64_t tmp; + fdt32_t tmp; const char *path; uint64_t addr, size; @@ -198,11 +170,9 @@ int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end, int force) return err; } - addr_cell_len = get_cells_len(fdt, "#address-cells"); - path = fdt_getprop(fdt, nodeoffset, "linux,initrd-start", NULL); if ((path == NULL) || force) { - write_cell((u8 *)&tmp, initrd_start, addr_cell_len); + tmp = cpu_to_fdt32(initrd_start); err = fdt_setprop(fdt, nodeoffset, "linux,initrd-start", &tmp, sizeof(tmp)); if (err < 0) { @@ -211,7 +181,7 @@ int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end, int force) fdt_strerror(err)); return err; } - write_cell((u8 *)&tmp, initrd_end, addr_cell_len); + tmp = cpu_to_fdt32(initrd_end); err = fdt_setprop(fdt, nodeoffset, "linux,initrd-end", &tmp, sizeof(tmp)); if (err < 0) { @@ -373,6 +343,34 @@ void do_fixup_by_compat_u32(void *fdt, const char *compat, do_fixup_by_compat(fdt, compat, prop, &tmp, 4, create); } +/* + * Get cells len in bytes + * if #NNNN-cells property is 2 then len is 8 + * otherwise len is 4 + */ +static int get_cells_len(void *blob, char *nr_cells_name) +{ + const fdt32_t *cell; + + cell = fdt_getprop(blob, 0, nr_cells_name, NULL); + if (cell && fdt32_to_cpu(*cell) == 2) + return 8; + + return 4; +} + +/* + * Write a 4 or 8 byte big endian cell + */ +static void write_cell(u8 *addr, u64 val, int size) +{ + int shift = (size - 1) * 8; + while (size-- > 0) { + *addr++ = (val >> shift) & 0xff; + shift -= 8; + } +} + #ifdef CONFIG_NR_DRAM_BANKS #define MEMORY_BANKS_MAX CONFIG_NR_DRAM_BANKS #else -- 1.8.5.2

1 0