November 2014 - U-Boot

[U-Boot] [PATCH 1/8] ARM: UniPhier: do not compile platform data when CONFIG_OF_CONTROL=y
by Masahiro Yamada 27 Nov '14

27 Nov '14

Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> --- arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile | 2 +- arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile | 2 +- arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile b/arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile index fba1cc7..5d682d3 100644 --- a/arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile +++ b/arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile @@ -3,7 +3,7 @@ # obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o -obj-y += platdevice.o +obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o obj-y += boot-mode.o obj-$(CONFIG_SOC_INIT) += bcu_init.o sbc_init.o sg_init.o pll_init.o \ clkrst_init.o diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile b/arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile index 74129bc..fd1c432 100644 --- a/arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile +++ b/arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile @@ -3,7 +3,7 @@ # obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o -obj-y += platdevice.o +obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o obj-y += boot-mode.o obj-$(CONFIG_SOC_INIT) += sbc_init.o sg_init.o pll_init.o clkrst_init.o obj-$(CONFIG_BOARD_POSTCLK_INIT) += pinctrl.o diff --git a/arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile b/arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile index fba1cc7..5d682d3 100644 --- a/arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile +++ b/arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile @@ -3,7 +3,7 @@ # obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o -obj-y += platdevice.o +obj-$(if $(CONFIG_OF_CONTROL),,y) += platdevice.o obj-y += boot-mode.o obj-$(CONFIG_SOC_INIT) += bcu_init.o sbc_init.o sg_init.o pll_init.o \ clkrst_init.o -- 1.9.1

3 21

[U-Boot] [PATCH v8 0/6] fs: fat/ext4/sandbox - Deal with files greater than 2GB
by Suriyan Ramasami 27 Nov '14

27 Nov '14

The commands fatls/ext4ls give negative values when dealing with files greater than 2GB. The commands fatsize/ext4size do not update the variable filesize for these files. To deal with this, the fs functions have been modified to take an additional parameter of type "* loff_t" which is then populated. The return value of th fs functions are used only for error conditions. Changes in v8: - No changes. - Simon - indentation fixes - None - Simon, use variable size consistently across all changes. - (Simon) ext4_read_file(), return ext4fs_read() at end - (Simon) remove braces around if statement, if there is only one statement Changes in v7: - Add Ack - Separate this patch out - Split this patch for bisectability. - Simon, split this as a separate commit - (Pavel) U_BOOT_CMD save to reflect mandatory arguments - (Simon) Split this into a separate patch - Simon comments - take care of fat/vfat in mkfs - fs/nonfs test code repeats, put it in function Changes in v6: - Split this change into a separate commit - Update expected results in comments - Simon comments - Remove README file and add it in start of script - Drop blank lines in top of functions - Put repeating constants in lower case variables - Refer to U-Boot as U-Boot - Move settings to top of file and code in functions or otherwise at bottom - Create check_prereq function - Use mkfs -t <type> -F <img> for ext4, but modify for fat Changes in v5: - Simon comments - Add README file to document how to run it - Generate output in a sandbox environment - Add one line comments on shell variables used - Avoid camel case through out - Path to UBOOT is variable at top - Print PASSED or FAILED at end, and set return code, 0 if OK, 1 otherwise Suriyan Ramasami (6): sandbox: Use md5sum and fatwrite to enable testing of fs commands fat: Prepare API change for files greater than 2GB ext4: Prepare API change for files greater than 2GB sandbox: Prepare API change for files greater than 2GB fs: API changes enabling extra parameter to return size of type loff_t sandbox: script for testing sandbox/ext4/fat/fs commands arch/sandbox/cpu/os.c | 13 +- arch/sandbox/cpu/state.c | 8 +- common/board_f.c | 8 +- common/cmd_ext4.c | 61 +---- common/cmd_fat.c | 9 +- common/cmd_fs.c | 17 ++ common/cmd_md5sum.c | 12 +- common/env_fat.c | 4 +- fs/ext4/ext4_common.c | 24 +- fs/ext4/ext4_common.h | 4 +- fs/ext4/ext4_write.c | 32 +++ fs/ext4/ext4fs.c | 37 +-- fs/fat/fat.c | 130 ++++++----- fs/fat/fat_write.c | 61 ++--- fs/fat/file.c | 3 +- fs/fs.c | 77 ++++--- fs/sandbox/sandboxfs.c | 77 ++++--- include/configs/sandbox.h | 2 + include/ext4fs.h | 13 +- include/fat.h | 18 +- include/fs.h | 41 ++-- include/os.h | 5 +- include/sandboxfs.h | 14 +- test/fs/fs-test.sh | 561 ++++++++++++++++++++++++++++++++++++++++++++++ 24 files changed, 943 insertions(+), 288 deletions(-) create mode 100755 test/fs/fs-test.sh -- 1.8.3.1

4 16

[U-Boot] [PATCH v1 0/9] Add full DDR init for Marvell Armada-XP MV78xx0 (AXP)
by Stefan Roese 27 Nov '14

27 Nov '14

This patch adds the DDR3 setup and training code taken from the Marvell U-Boot repository. This code used to be included as a binary (bin_hdr) into the AXP boot image. Not linked with the main U-Boot. With this code addition and the also included SERDES / PHY setup code, the Armada-XP support in mainline U-Boot is finally self-contained. So the complete image for booting can be built from mainline U-Boot. Without any additional external inclusion. Hopefully other MVEBU SoC's will follow here. Tested on AXP using a SPD DIMM setup on the Marvell DB-MV784MP-GP board and on a custom fixed DDR configuration board (maxbcm with MV78460). Thanks, Stefan Stefan Roese (9): arm: mvebu: drivers/ddr: Add DDR3 driver with training code from Marvell bin_hdr arm: mvebu: Add Serdes PHY config code arm: armada-xp: Add SPL support used to include the DDR training code scripts/Makefile.spl: Add MVEBU DDR code to SPL tools: kwbimage: Support u-boot.img padding to CONFIG_SYS_SPI_U_BOOT_OFFS Makefile: Add another kwb build target used on Marvell Armada-XP (AXP) arm: db-mv784mp-gp: Enable SPL to include DDR training code into U-Boot arm: maxbcm: Enable SPL to include DDR training code into U-Boot arm: armada-xp: Change built target to include the SPL binary as bin_hdr Makefile | 6 + arch/arm/Kconfig | 2 + arch/arm/cpu/armv7/armada-xp/Makefile | 2 + arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S | 62 + arch/arm/cpu/armv7/armada-xp/spl.c | 38 + arch/arm/include/asm/arch-armada-xp/config.h | 4 + arch/arm/include/asm/arch-armada-xp/cpu.h | 16 + arch/arm/mvebu-common/Makefile | 2 + arch/arm/mvebu-common/serdes/Makefile | 6 + arch/arm/mvebu-common/serdes/board_env_spec.h | 262 ++++ arch/arm/mvebu-common/serdes/high_speed_env_lib.c | 1572 +++++++++++++++++++ arch/arm/mvebu-common/serdes/high_speed_env_spec.c | 185 +++ arch/arm/mvebu-common/serdes/high_speed_env_spec.h | 87 ++ arch/arm/mvebu-common/u-boot-spl.lds | 57 + board/Marvell/db-mv784mp-gp/kwbimage.cfg | 2 +- board/maxbcm/kwbimage.cfg | 2 +- board/maxbcm/maxbcm.c | 83 +- configs/db-mv784mp-gp_defconfig | 5 +- configs/maxbcm_defconfig | 5 +- drivers/ddr/mvebu/Makefile | 14 + drivers/ddr/mvebu/ddr3_axp.h | 510 +++++++ drivers/ddr/mvebu/ddr3_axp_config.h | 146 ++ drivers/ddr/mvebu/ddr3_axp_mc_static.h | 284 ++++ drivers/ddr/mvebu/ddr3_axp_training_static.h | 770 ++++++++++ drivers/ddr/mvebu/ddr3_axp_vars.h | 226 +++ drivers/ddr/mvebu/ddr3_dfs.c | 1552 +++++++++++++++++++ drivers/ddr/mvebu/ddr3_dqs.c | 1374 +++++++++++++++++ drivers/ddr/mvebu/ddr3_hw_training.c | 1115 ++++++++++++++ drivers/ddr/mvebu/ddr3_hw_training.h | 392 +++++ drivers/ddr/mvebu/ddr3_init.c | 1219 +++++++++++++++ drivers/ddr/mvebu/ddr3_init.h | 143 ++ drivers/ddr/mvebu/ddr3_patterns_64bit.h | 924 ++++++++++++ drivers/ddr/mvebu/ddr3_pbs.c | 1592 ++++++++++++++++++++ drivers/ddr/mvebu/ddr3_read_leveling.c | 1214 +++++++++++++++ drivers/ddr/mvebu/ddr3_sdram.c | 669 ++++++++ drivers/ddr/mvebu/ddr3_spd.c | 1300 ++++++++++++++++ drivers/ddr/mvebu/ddr3_write_leveling.c | 1366 +++++++++++++++++ drivers/ddr/mvebu/xor.c | 436 ++++++ drivers/ddr/mvebu/xor.h | 70 + drivers/ddr/mvebu/xor_regs.h | 103 ++ include/configs/db-mv784mp-gp.h | 49 + include/configs/maxbcm.h | 47 + scripts/Makefile.spl | 3 + tools/kwbimage.c | 11 + 44 files changed, 17919 insertions(+), 8 deletions(-) create mode 100644 arch/arm/cpu/armv7/armada-xp/lowlevel_spl.S create mode 100644 arch/arm/cpu/armv7/armada-xp/spl.c create mode 100644 arch/arm/mvebu-common/serdes/Makefile create mode 100644 arch/arm/mvebu-common/serdes/board_env_spec.h create mode 100644 arch/arm/mvebu-common/serdes/high_speed_env_lib.c create mode 100644 arch/arm/mvebu-common/serdes/high_speed_env_spec.c create mode 100644 arch/arm/mvebu-common/serdes/high_speed_env_spec.h create mode 100644 arch/arm/mvebu-common/u-boot-spl.lds create mode 100644 drivers/ddr/mvebu/Makefile create mode 100644 drivers/ddr/mvebu/ddr3_axp.h create mode 100644 drivers/ddr/mvebu/ddr3_axp_config.h create mode 100644 drivers/ddr/mvebu/ddr3_axp_mc_static.h create mode 100644 drivers/ddr/mvebu/ddr3_axp_training_static.h create mode 100644 drivers/ddr/mvebu/ddr3_axp_vars.h create mode 100644 drivers/ddr/mvebu/ddr3_dfs.c create mode 100644 drivers/ddr/mvebu/ddr3_dqs.c create mode 100644 drivers/ddr/mvebu/ddr3_hw_training.c create mode 100644 drivers/ddr/mvebu/ddr3_hw_training.h create mode 100644 drivers/ddr/mvebu/ddr3_init.c create mode 100644 drivers/ddr/mvebu/ddr3_init.h create mode 100644 drivers/ddr/mvebu/ddr3_patterns_64bit.h create mode 100644 drivers/ddr/mvebu/ddr3_pbs.c create mode 100644 drivers/ddr/mvebu/ddr3_read_leveling.c create mode 100644 drivers/ddr/mvebu/ddr3_sdram.c create mode 100644 drivers/ddr/mvebu/ddr3_spd.c create mode 100644 drivers/ddr/mvebu/ddr3_write_leveling.c create mode 100644 drivers/ddr/mvebu/xor.c create mode 100644 drivers/ddr/mvebu/xor.h create mode 100644 drivers/ddr/mvebu/xor_regs.h -- 2.1.2

1 11

[U-Boot] Please pull u-boot-sunxi master
by Hans de Goede 27 Nov '14

27 Nov '14

Hi Tom, Please pull u-boot-sunxi/master into master, highlights: 1) hdmi console (with usb keyboard) support with simplefb support so the kernel can use the framebuffer too 2) GMAC support for sun6i 3) A couple of small bugfixes Note I've done a rebase + forced-push, as things were becoming a bit messy while merging. The following changes since commit 2a82ec77d27ef5f860a107c4b764643a655dceeb: Prepare v2015.01-rc2 (2014-11-24 17:08:47 -0500) are available in the git repository at: http://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to b366fb92c3d118f97bb0f01fa9c40d253e70e12c: sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set (2014-11-25 13:38:46 +0100) ---------------------------------------------------------------- Hans de Goede (12): sun4i: Rename dram_clk_cfg to dram_clk_gate sunxi: Add video pll clock functions sunxi: video: Add sun6i support fdt_support: Add a fdt_setup_simplefb_node helper function common/lcd: Make lcd_dt_simplefb_configure_node use fdt_setup_simplefb_node sunxi: Add usb keyboard Kconfig option sunxi: ahci: Add a delay after enabling target power sun6i: Correct Mele M9 Vbus gpio settings sun6i: Add gmac support for sun6i boards sun6i: Drop some "unknown magic" from dram init sun7i: Drop CONFIG_ARMV7_PSCI_NR_CPUS sun7i: Set ARMV7_BOOT_SEC_DEFAULT when OLD_SUNXI_KERNEL_COMPAT is set Luc Verhaegen (2): sunxi: video: Add cfb console driver for sunxi sunxi: video: Add simplefb support arch/arm/cpu/armv7/sunxi/clock_sun4i.c | 27 ++ arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 29 ++ arch/arm/cpu/armv7/sunxi/dram_sun4i.c | 4 +- arch/arm/cpu/armv7/sunxi/dram_sun6i.c | 3 - arch/arm/include/asm/arch-sunxi/clock.h | 2 + arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 47 ++- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 67 +++- arch/arm/include/asm/arch-sunxi/cpu.h | 4 + arch/arm/include/asm/arch-sunxi/display.h | 187 +++++++++++ arch/arm/include/asm/arch-sunxi/gpio.h | 1 + board/sunxi/Kconfig | 15 + board/sunxi/ahci.c | 2 + board/sunxi/board.c | 10 + board/sunxi/gmac.c | 45 +++ common/fdt_support.c | 62 ++++ common/lcd.c | 47 +-- configs/A13-OLinuXinoM_defconfig | 2 + configs/A13-OLinuXino_defconfig | 2 + configs/Colombus_defconfig | 1 + configs/Ippo_q8h_v5_defconfig | 2 + configs/Mele_M9_defconfig | 8 +- drivers/video/Makefile | 1 + drivers/video/sunxi_display.c | 451 ++++++++++++++++++++++++++ include/configs/sun7i.h | 1 - include/configs/sunxi-common.h | 62 ++++ include/fdt_support.h | 3 + 26 files changed, 1032 insertions(+), 53 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/display.h create mode 100644 drivers/video/sunxi_display.c Regards, Hans

3 6

[U-Boot] Export redesign
by Martin Dorwig 27 Nov '14

27 Nov '14

Hello, while trying to eliminate the XF_xxx enums, i came to a point in examples/standalone/stubs.c In the definition of EXPORT_FUNC for CONFIG_AVR32 the XF_ ##x is not multiplied with sizeof(void*) . Is this a bug or a avr feature ? Regards Martin

2 2

[U-Boot] [PATCH 0/8] dm: core: abolish "u-boot, dm-pre-reloc" property and various refactorings
by Masahiro Yamada 26 Nov '14

26 Nov '14

I am implemting Device Tree support for Panasonic UniPhier platform, but while I was working on that, I noticed some problems in DM core implementation. What I want to solve the most here is the inconsistency in terms of how to pass the pre-reloc attribute. The driver model provides two ways to pass the device information, platform data and device tree. In the platform data way, the pre-reloc DM scan checks if each driver has DM_FLAG_PRE_RELOC flag, that is, each **driver** has the pre-reloc attribute. In the device tree control, the existence of "u-boot,dm-pre-reloc" is checked for each device node. The driver flag "DM_FLAG_PRE_RELOC" is never checked. That is, each **device** owns the pre-reloc attribute. Drivers should generally work both with platform data and device tree, but this inconsitency has made our life difficult. This series aims to abolish "u-boot,dm-pre-reloc" property because: - Having a U-Boot specific property makes it difficult to share the device tree sources between Linux and U-Boot. - The number of devices is generally larger than that of drivers. Each driver often has multiple devices with different base addresses. It seems more reasonable to add the pre-reloc attribute to drivers than devices. 8/8 commit abolishes "u-boot,dm-pre-reloc" property and replaces it with some *driver* attribute. When I am working on that, I came up with another idea. I thought it is unefficient to scan all the drivers and then check the DM_FLAG_PRE_RELOC. Becuase the DM_FLAG_PRE_RELOC is a static data, we know if each driver is a pre-reloc one or not. So, 6/8 introduces more efficient driver scanning. 1/8 thru 5/8 are some cleanups before I do new things. Masahiro Yamada (8): dm: core: a trivial clean up dm: core: remove meaningless if conditional dm: core: remove unnecessary return condition in driver lookup dm: core: remove unnecessary return condition in uclass lookup dm: core: refactor linker lists lookup code dm: core: look up drivers more efficiently dm: core: declare pre-reloc drivers with U_BOOT_DRIVER_F dm: core: abolish u-boot,dm-pre-reloc property arch/arm/dts/exynos5.dtsi | 1 - doc/driver-model/README.txt | 5 ++-- drivers/core/device.c | 4 +-- drivers/core/lists.c | 57 ++++++++++++++++++---------------------- drivers/core/root.c | 13 ++++----- drivers/core/simple-bus.c | 2 +- drivers/serial/sandbox.c | 3 +-- drivers/serial/serial_mxc.c | 3 +-- drivers/serial/serial_omap.c | 3 +-- drivers/serial/serial_pl01x.c | 3 +-- drivers/serial/serial_s5p.c | 3 +-- drivers/serial/serial_uniphier.c | 3 +-- include/dm/device.h | 11 ++++---- include/dm/lists.h | 29 +++++++++++++++----- include/dm/root.h | 20 +++++++------- test/dm/test-driver.c | 3 +-- test/dm/test-fdt.c | 2 +- test/dm/test.dts | 2 -- 18 files changed, 80 insertions(+), 87 deletions(-) -- 1.9.1

3 33

[U-Boot] [PATCH v2] fs/ext4/ext4fs.c, fs/fs.c fs/fat/fat_write.c: Adjust 64bit math methods
by Tom Rini 26 Nov '14

26 Nov '14

The changes to introduce loff_t into filesize means that we need to do 64bit math on 32bit platforms. Make sure we use the right wrappers for these operations. Cc: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> Cc: Suriyan Ramasami <suriyan.r(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Signed-off-by: Tom Rini <trini(a)ti.com> --- fs/ext4/ext4fs.c | 11 ++++++----- fs/fat/fat_write.c | 10 ++++++---- fs/fs.c | 6 ++++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index 943b5bc..258b9379 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -25,6 +25,7 @@ #include <ext_common.h> #include <ext4fs.h> #include "ext4_common.h" +#include <div64.h> int ext4fs_symlinknest; struct ext_filesystem ext_fs; @@ -67,11 +68,11 @@ int ext4fs_read_file(struct ext2fs_node *node, loff_t pos, if (len > filesize) len = filesize; - blockcnt = ((len + pos) + blocksize - 1) / blocksize; + blockcnt = lldiv(((len + pos) + blocksize - 1), blocksize); - for (i = pos / blocksize; i < blockcnt; i++) { + for (i = lldiv(pos, blocksize); i < blockcnt; i++) { lbaint_t blknr; - int blockoff = pos % blocksize; + int blockoff = pos - (blocksize * i); int blockend = blocksize; int skipfirst = 0; blknr = read_allocated_block(&(node->inode), i); @@ -82,7 +83,7 @@ int ext4fs_read_file(struct ext2fs_node *node, loff_t pos, /* Last block. */ if (i == blockcnt - 1) { - blockend = (len + pos) % blocksize; + blockend = (len + pos) - (blocksize * i); /* The last portion is exactly blocksize. */ if (!blockend) @@ -90,7 +91,7 @@ int ext4fs_read_file(struct ext2fs_node *node, loff_t pos, } /* First block. */ - if (i == pos / blocksize) { + if (i == lldiv(pos, blocksize)) { skipfirst = blockoff; blockend -= skipfirst; } diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 88dd495..473723b 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -13,6 +13,8 @@ #include <asm/byteorder.h> #include <part.h> #include <linux/ctype.h> +#include <div64.h> +#include <linux/math64.h> #include "fat.c" static void uppercase(char *str, int len) @@ -770,7 +772,7 @@ static void fill_dentry(fsdata *mydata, dir_entry *dentptr, */ static int check_overflow(fsdata *mydata, __u32 clustnum, loff_t size) { - __u32 startsect, sect_num; + __u32 startsect, sect_num, offset; if (clustnum > 0) { startsect = mydata->data_begin + @@ -779,13 +781,13 @@ static int check_overflow(fsdata *mydata, __u32 clustnum, loff_t size) startsect = mydata->rootdir_sect; } - sect_num = size / mydata->sect_size; - if (size % mydata->sect_size) + sect_num = div_u64_rem(size, mydata->sect_size, &offset); + + if (offset != 0) sect_num++; if (startsect + sect_num > cur_part_info.start + total_sector) return -1; - return 0; } diff --git a/fs/fs.c b/fs/fs.c index 3da7860..52078139 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -23,6 +23,8 @@ #include <fs.h> #include <sandboxfs.h> #include <asm/io.h> +#include <div64.h> +#include <linux/math64.h> DECLARE_GLOBAL_DATA_PTR; @@ -399,7 +401,7 @@ int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], printf("%llu bytes read in %lu ms", len_read, time); if (time > 0) { puts(" ("); - print_size(len_read / time * 1000, "/s"); + print_size(div_u64(len_read, time * 1000), "/s"); puts(")"); } puts("\n"); @@ -469,7 +471,7 @@ int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], printf("%llu bytes written in %lu ms", len, time); if (time > 0) { puts(" ("); - print_size(len / time * 1000, "/s"); + print_size(div_u64(len, time * 1000), "/s"); puts(")"); } puts("\n"); -- 1.7.9.5

2 2

[U-Boot] [PATCH] spi: Fix flag collision for SST_WP
by Simon Glass 26 Nov '14

26 Nov '14

At present SECT_4K is the same as SST_WP so we cannot tell these apart. Fix this so that the table in sf_params.c can be used correctly. Reported-by: Jens Rottmann <Jens.Rottmann(a)adlinktech.com> Signed-off-by: Simon Glass <sjg(a)chromium.org> --- drivers/mtd/spi/sf_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 5b7670c..1d6a138 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -38,6 +38,7 @@ enum { SECT_32K = 1 << 1, E_FSR = 1 << 2, WR_QPP = 1 << 3, + SST_WP = 1 << 4, /* Supports AAI word program */ }; #define SPI_FLASH_3B_ADDR_LEN 3 @@ -101,7 +102,6 @@ enum { /* SST specific */ #ifdef CONFIG_SPI_FLASH_SST -# define SST_WP 0x01 /* Supports AAI word program */ # define CMD_SST_BP 0x02 /* Byte Program */ # define CMD_SST_AAI_WP 0xAD /* Auto Address Incr Word Program */ -- 2.2.0.rc0.207.ga3a616c

1 0

[U-Boot] [PATCH 1/2] socfpga: add missing struct member fifo_triple_byte
by dinguyen＠opensource.altera.com 26 Nov '14

26 Nov '14

From: Dinh Nguyen <dinguyen(a)opensource.altera.com> socfpga_scan_manager structure was missing a data member. Signed-off-by: Dinh Nguyen <dinguyen(a)opensource.altera.com> Cc: Vince Bridgers <vbridger(a)opensource.altera.com> Cc: Chin Liang See <clsee(a)altera.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Pavel Machek <pavel(a)denx.de> Cc: Wolfgang Denk <wd(a)denx.de> --- arch/arm/include/asm/arch-socfpga/scan_manager.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/include/asm/arch-socfpga/scan_manager.h b/arch/arm/include/asm/arch-socfpga/scan_manager.h index b2686d3..1155fd3 100644 --- a/arch/arm/include/asm/arch-socfpga/scan_manager.h +++ b/arch/arm/include/asm/arch-socfpga/scan_manager.h @@ -13,6 +13,7 @@ struct socfpga_scan_manager { u32 padding[2]; u32 fifo_single_byte; u32 fifo_double_byte; + u32 fifo_triple_byte; u32 fifo_quad_byte; }; -- 2.0.3

1 1

[U-Boot] [PATCH V2] cmd_i2c: Provide option for bulk 'i2c write' in one transaction
by Lubomir Popov 26 Nov '14

26 Nov '14

I2C chips do exist that require a write of some multi-byte data to occur in a single bus transaction (aka atomic transfer), otherwise either the write does not come into effect at all, or normal operation of internal circuitry cannot be guaranteed. The current implementation of the 'i2c write' command (transfer of multiple bytes from a memory buffer) in fact performs a separate transaction for each byte to be written and thus cannot support such types of I2C slave devices. This patch provides an alternative by allowing 'i2c write' to execute the write transfer of the given number of bytes in a single bus transaction if the '-s' option is specified as a final command argument. Else the current re-addressing method is used. Signed-off-by: Lubomir Popov <l-popov(a)ti.com> --- Changes in V2: The option to use bulk transfer vs re-addressing is implemented as a run-time command argument and shall better fit into the new I2C DM (thanks to Simon for the hint). V1 used conditional compilation through a board header definition. common/cmd_i2c.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index c266b88..5cb7dca 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -270,7 +270,7 @@ static int do_i2c_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ uint devaddr, alen, length; u_char *memaddr; - if (argc != 5) + if ((argc < 5) || (argc > 6)) return cmd_usage(cmdtp); /* @@ -293,20 +293,34 @@ static int do_i2c_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[ return cmd_usage(cmdtp); /* - * Length is the number of objects, not number of bytes. + * Length is the number of bytes. */ length = simple_strtoul(argv[4], NULL, 16); - - while (length-- > 0) { - if (i2c_write(chip, devaddr++, alen, memaddr++, 1) != 0) { + + if (argc == 6 && !strcmp(argv[5], "-s")) { + /* + * Write all bytes in a single I2C transaction. If the target + * device is an EEPROM, it is your responsibility to not cross + * a page boundary. No write delay upon completion, take this + * into account if linking commands. + */ + if (i2c_write(chip, devaddr, alen, memaddr, length) != 0) return i2c_report_err(-1, I2C_ERR_WRITE); - } + } else { + /* + * Repeated addressing - perform <length> separate + * write transactions of one byte each + */ + while (length-- > 0) { + if (i2c_write(chip, devaddr++, alen, memaddr++, 1) != 0) + return i2c_report_err(-1, I2C_ERR_WRITE); /* * No write delay with FRAM devices. */ #if !defined(CONFIG_SYS_I2C_FRAM) - udelay(11000); + udelay(11000); #endif + } } return 0; } @@ -1559,7 +1573,7 @@ static cmd_tbl_t cmd_i2c_sub[] = { U_BOOT_CMD_MKENT(nm, 2, 1, do_i2c_nm, "", ""), U_BOOT_CMD_MKENT(probe, 0, 1, do_i2c_probe, "", ""), U_BOOT_CMD_MKENT(read, 5, 1, do_i2c_read, "", ""), - U_BOOT_CMD_MKENT(write, 5, 0, do_i2c_write, "", ""), + U_BOOT_CMD_MKENT(write, 6, 0, do_i2c_write, "", ""), U_BOOT_CMD_MKENT(reset, 0, 1, do_i2c_reset, "", ""), #if defined(CONFIG_CMD_SDRAM) U_BOOT_CMD_MKENT(sdram, 1, 1, do_sdram, "", ""), @@ -1623,7 +1637,8 @@ static char i2c_help_text[] = "i2c nm chip address[.0, .1, .2] - write to I2C device (constant address)\n" "i2c probe [address] - test for and show device(s) on the I2C bus\n" "i2c read chip address[.0, .1, .2] length memaddress - read to memory \n" - "i2c write memaddress chip address[.0, .1, .2] length - write memory to i2c\n" + "i2c write memaddress chip address[.0, .1, .2] length [-s] - write memory\n" + " to I2C; the -s option selects bulk write in a single transaction\n" "i2c reset - re-init the I2C Controller\n" #if defined(CONFIG_CMD_SDRAM) "i2c sdram chip - print SDRAM configuration information\n" @@ -1632,7 +1647,7 @@ static char i2c_help_text[] = #endif U_BOOT_CMD( - i2c, 6, 1, do_i2c, + i2c, 7, 1, do_i2c, "I2C sub-system", i2c_help_text ); -- 1.7.9.5

2 1