January 2014 - U-Boot

[U-Boot] [PATCH v3 0/4] sf: Add support to access dual flash memory
by Jagannadha Sutradharudu Teki 06 Jan '14

06 Jan '14

This patchset adds support for dual flash memory accessing with single chipselect line from the controller. dual flash memory support is implemented in xilinx zynq qspi controllers in which dual stacked and dual parallel are the connection modes. -- Thanks, Jagan. Changes for v3: - renamed nr_flash into dual_flash along with macro names Changes for v2: - rebase to current spi tree - "option" variable on spi_slave so-that controller driver can specify which they use - Unify common code Jagannadha Sutradharudu Teki (4): sf: ops: Unify read_ops bank configuration sf: Add dual memories support - DUAL_STACKED sf: Add dual memories support - DUAL_PARALLEL sf: Add CONFIG_SF_DUAL_FLASH README | 6 +++ doc/SPI/README.dual-flash | 92 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/mtd/spi/sf.c | 4 ++ drivers/mtd/spi/sf_ops.c | 80 +++++++++++++++++++++++++++++++--------- drivers/mtd/spi/sf_probe.c | 21 ++++++++--- include/spi.h | 9 +++++ include/spi_flash.h | 11 ++++++ 7 files changed, 199 insertions(+), 24 deletions(-) create mode 100644 doc/SPI/README.dual-flash -- 1.8.3

1 0

[U-Boot] [U-BOOT PATCH v7 08/12] sf: Discover read dummy_byte
by Jagannadha Sutradharudu Teki 06 Jan '14

06 Jan '14

Discovered the read dummy_byte based on the configured read command. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- Changes for v7: - Use the name dummy_byte instead of dummy_cycles drivers/mtd/spi/sf_internal.h | 2 ++ drivers/mtd/spi/sf_ops.c | 10 ++++++---- drivers/mtd/spi/sf_probe.c | 19 +++++++++++++++++++ include/spi_flash.h | 2 ++ 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 7be0292..a9f5a81 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -10,6 +10,8 @@ #ifndef _SF_INTERNAL_H_ #define _SF_INTERNAL_H_ +#define SPI_FLASH_3B_ADDR_LEN 3 +#define SPI_FLASH_CMD_LEN (1 + SPI_FLASH_3B_ADDR_LEN) #define SPI_FLASH_16MB_BOUN 0x1000000 /* CFI Manufacture ID's */ diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 827f719..8489763 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -9,6 +9,7 @@ */ #include <common.h> +#include <malloc.h> #include <spi.h> #include <spi_flash.h> #include <watchdog.h> @@ -216,7 +217,7 @@ int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd, int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len) { u32 erase_size; - u8 cmd[4]; + u8 cmd[SPI_FLASH_CMD_LEN]; int ret = -1; erase_size = flash->erase_size; @@ -255,7 +256,7 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset, { unsigned long byte_addr, page_size; size_t chunk_len, actual; - u8 cmd[4]; + u8 cmd[SPI_FLASH_CMD_LEN]; int ret = -1; page_size = flash->page_size; @@ -317,7 +318,7 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd, int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, size_t len, void *data) { - u8 cmd[5], bank_sel = 0; + u8 *cmd, bank_sel = 0; u32 remain_len, read_len; int ret = -1; @@ -335,8 +336,9 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, return 0; } + cmd = malloc(SPI_FLASH_CMD_LEN + flash->dummy_byte); + memset(cmd, 0, SPI_FLASH_CMD_LEN + flash->dummy_byte); cmd[0] = flash->read_cmd; - cmd[4] = 0x00; while (len) { #ifdef CONFIG_SPI_FLASH_BAR diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index a049e72..8bd06ee 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -140,6 +140,25 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, } } + /* Read dummy_byte: dummy byte is determined based on the + * dummy cycles of a particular command. + * Fast commands - dummy_byte = dummy_cycles/8 + * I/O commands- dummy_byte = (dummy_cycles * no.of lines)/8 + * For I/O commands except cmd[0] everything goes on no.of lines + * based on particular command but incase of fast commands except + * data all go on single line irrespective of command. + */ + switch (flash->read_cmd) { + case CMD_READ_QUAD_IO_FAST: + flash->dummy_byte = 2; + break; + case CMD_READ_ARRAY_SLOW: + flash->dummy_byte = 0; + break; + default: + flash->dummy_byte = 1; + } + /* Poll cmd seclection */ flash->poll_cmd = CMD_READ_STATUS; #ifdef CONFIG_SPI_FLASH_STMICRO diff --git a/include/spi_flash.h b/include/spi_flash.h index d24e40a..f9d640c 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -72,6 +72,7 @@ extern const struct spi_flash_params spi_flash_params_table[]; * @erase_cmd: Erase cmd 4K, 32K, 64K * @read_cmd: Read cmd - Array Fast, Extn read and quad read. * @write_cmd: Write cmd - page and quad program. + * @dummy_byte: Dummy cycles for read operation. * @memory_map: Address of read-only SPI flash access * @read: Flash read ops: Read len bytes at offset into buf * Supported cmds: Fast Array Read @@ -98,6 +99,7 @@ struct spi_flash { u8 erase_cmd; u8 read_cmd; u8 write_cmd; + u8 dummy_byte; void *memory_map; int (*read)(struct spi_flash *flash, u32 offset, size_t len, void *buf); -- 1.8.3

1 0

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

06 Jan '14

Hi Tom, Sending this PR for more zynq board support - waited since long time. -- Thanks, Jagan. The following changes since commit 39859fc42750c6a82f5c9484ddf4c0992be97c36: sandbox: spi: Adjust 'sf test' to work on sandbox (2013-12-21 11:46:45 +0530) are available in the git repository at: git://git.denx.de/u-boot-spi.git master-xlnx for you to fetch changes up to 19992190ebd7fe2df9e0720961e2c67f3eea4b0a: doc: Update the zynq u-boot status (2013-12-21 12:07:09 +0530) ---------------------------------------------------------------- Jagannadha Sutradharudu Teki (29): zynq: Enable CONFIG_FIT_VERBOSE zynq: Enable Boot FreeBSD/vxWorks zynq: Cleanup on miscellaneous configs zynq: Cleanup on memory configs zynq: Minor config cleanup zynq: Enable cache options zynq: Add UART0, UART1 configs support zynq: Add GEM0, GEM1 configs support zynq-common: Rename zynq with zynq-common doc: zynq: Add information on zynq u-boot zynq: Add zynq zc70x board support zynq: Add zynq zed board support zynq: Move CONFIG_SYS_SDRAM_SIZE to pre-board configs zynq-common: Define exact TEXT_BASE zynq: zc70x: Add Catalyst 24WC08 EEPROM config support zynq: Add zynq microzed board support zynq: Add zynq_zc770 xm010 board support zynq: Add zynq_zc770 xm013 board support zynq: Add zynq_zc770 xm012 board support zynq: Add support to find bootmode zynq-common: Define default environment zynq-common: Change Env. Sector size to 128Kb zynq-common: Define flash env. partition zynq-common: Define CONFIG_ENV_OVERWRITE dts: zynq: Add basic fdt support gpio: zynq: Add dummy gpio routines zynq-common: Enable verified boot(RSA) dts: zynq: Add more zynq dts files doc: Update the zynq u-boot status arch/arm/cpu/armv7/zynq/slcr.c | 6 + arch/arm/dts/zynq-7000.dtsi | 13 ++ arch/arm/include/asm/arch-zynq/gpio.h | 25 +++ arch/arm/include/asm/arch-zynq/sys_proto.h | 1 + board/xilinx/dts/zynq-microzed.dts | 14 ++ board/xilinx/dts/zynq-zc702.dts | 14 ++ board/xilinx/dts/zynq-zc706.dts | 14 ++ board/xilinx/dts/zynq-zc770-xm010.dts | 14 ++ board/xilinx/dts/zynq-zc770-xm012.dts | 14 ++ board/xilinx/dts/zynq-zc770-xm013.dts | 14 ++ board/xilinx/dts/zynq-zed.dts | 14 ++ board/xilinx/zynq/board.c | 25 +++ boards.cfg | 8 +- doc/README.zynq | 91 +++++++++++ include/configs/zynq-common.h | 238 +++++++++++++++++++++++++++++ include/configs/zynq.h | 139 ----------------- include/configs/zynq_microzed.h | 25 +++ include/configs/zynq_zc70x.h | 28 ++++ include/configs/zynq_zc770.h | 39 +++++ include/configs/zynq_zed.h | 26 ++++ 20 files changed, 621 insertions(+), 141 deletions(-) create mode 100644 arch/arm/dts/zynq-7000.dtsi create mode 100644 arch/arm/include/asm/arch-zynq/gpio.h create mode 100644 board/xilinx/dts/zynq-microzed.dts create mode 100644 board/xilinx/dts/zynq-zc702.dts create mode 100644 board/xilinx/dts/zynq-zc706.dts create mode 100644 board/xilinx/dts/zynq-zc770-xm010.dts create mode 100644 board/xilinx/dts/zynq-zc770-xm012.dts create mode 100644 board/xilinx/dts/zynq-zc770-xm013.dts create mode 100644 board/xilinx/dts/zynq-zed.dts create mode 100644 doc/README.zynq create mode 100644 include/configs/zynq-common.h delete mode 100644 include/configs/zynq.h create mode 100644 include/configs/zynq_microzed.h create mode 100644 include/configs/zynq_zc70x.h create mode 100644 include/configs/zynq_zc770.h create mode 100644 include/configs/zynq_zed.h

2 1

[U-Boot] [PATCH] t2080qds/ddr: update ddr parameters
by Shengzhou Liu 06 Jan '14

06 Jan '14

- Optimize UDIMM parameters for whole range from 1500MT/s to 2140MT/s. - Remove unused patameters: 'cpo', 'wrdata delay', '2T', which are unrelated to DDR3/3L. Signed-off-by: Shengzhou Liu <Shengzhou.Liu(a)freescale.com> --- board/freescale/t2080qds/ddr.c | 12 ++------ board/freescale/t2080qds/ddr.h | 65 +++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 49 deletions(-) diff --git a/board/freescale/t2080qds/ddr.c b/board/freescale/t2080qds/ddr.c index 9f6c9c4..b4def3c 100644 --- a/board/freescale/t2080qds/ddr.c +++ b/board/freescale/t2080qds/ddr.c @@ -24,7 +24,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, const struct board_specific_parameters *pbsp, *pbsp_highest = NULL; ulong ddr_freq; - if (ctrl_num > 2) { + if (ctrl_num > 1) { printf("Not supported controller number %d\n", ctrl_num); return; } @@ -40,8 +40,7 @@ void fsl_ddr_board_options(memctl_options_t *popts, else pbsp = udimms[0]; - - /* Get clk_adjust, cpo, write_data_delay,2T, according to the board ddr + /* Get clk_adjust, wrlvl_start, wrlvl_ctl, according to the board ddr * freqency and n_banks specified in board_specific_parameters table. */ ddr_freq = get_ddr_freq(0) / 1000000; @@ -49,14 +48,10 @@ void fsl_ddr_board_options(memctl_options_t *popts, if (pbsp->n_ranks == pdimm->n_ranks && (pdimm->rank_density >> 30) >= pbsp->rank_gb) { if (ddr_freq <= pbsp->datarate_mhz_high) { - popts->cpo_override = pbsp->cpo; - popts->write_data_delay = - pbsp->write_data_delay; popts->clk_adjust = pbsp->clk_adjust; popts->wrlvl_start = pbsp->wrlvl_start; popts->wrlvl_ctl_2 = pbsp->wrlvl_ctl_2; popts->wrlvl_ctl_3 = pbsp->wrlvl_ctl_3; - popts->twot_en = pbsp->force_2t; goto found; } pbsp_highest = pbsp; @@ -69,13 +64,10 @@ void fsl_ddr_board_options(memctl_options_t *popts, printf("for data rate %lu MT/s\n", ddr_freq); printf("Trying to use the highest speed (%u) parameters\n", pbsp_highest->datarate_mhz_high); - popts->cpo_override = pbsp_highest->cpo; - popts->write_data_delay = pbsp_highest->write_data_delay; popts->clk_adjust = pbsp_highest->clk_adjust; popts->wrlvl_start = pbsp_highest->wrlvl_start; popts->wrlvl_ctl_2 = pbsp->wrlvl_ctl_2; popts->wrlvl_ctl_3 = pbsp->wrlvl_ctl_3; - popts->twot_en = pbsp_highest->force_2t; } else { panic("DIMM is not supported by this board"); } diff --git a/board/freescale/t2080qds/ddr.h b/board/freescale/t2080qds/ddr.h index 964eaad..9fc879a 100644 --- a/board/freescale/t2080qds/ddr.h +++ b/board/freescale/t2080qds/ddr.h @@ -14,9 +14,6 @@ struct board_specific_parameters { u32 wrlvl_start; u32 wrlvl_ctl_2; u32 wrlvl_ctl_3; - u32 cpo; - u32 write_data_delay; - u32 force_2t; }; /* @@ -28,58 +25,48 @@ struct board_specific_parameters { static const struct board_specific_parameters udimm0[] = { /* * memory controller 0 - * num| hi| rank| clk| wrlvl | wrlvl | wrlvl | cpo |wrdata|2T - * ranks| mhz| GB |adjst| start | ctl2 | ctl3 | |delay | + * num| hi| rank| clk| wrlvl | wrlvl | wrlvl | + * ranks| mhz| GB |adjst| start | ctl2 | ctl3 | */ - {2, 1350, 4, 4, 8, 0x0809090b, 0x0c0c0d0a, 0xff, 2, 0}, - {2, 1350, 0, 5, 7, 0x0709090b, 0x0c0c0d09, 0xff, 2, 0}, - {2, 1666, 4, 4, 8, 0x080a0a0d, 0x0d10100b, 0xff, 2, 0}, - {2, 1666, 0, 5, 7, 0x080a0a0c, 0x0d0d0e0a, 0xff, 2, 0}, - {2, 1900, 0, 4, 8, 0x090a0b0e, 0x0f11120c, 0xff, 2, 0}, - {2, 2140, 0, 4, 8, 0x090a0b0e, 0x0f11120c, 0xff, 2, 0}, - {1, 1350, 0, 5, 8, 0x0809090b, 0x0c0c0d0a, 0xff, 2, 0}, - {1, 1700, 0, 5, 8, 0x080a0a0c, 0x0c0d0e0a, 0xff, 2, 0}, - {1, 1800, 2, 5, 6, 0x06070709, 0x110a0b08, 0xff, 2, 0}, - {1, 1866, 2, 4, 6, 0x06060708, 0x09090a07, 0xff, 2, 0}, - {1, 1900, 2, 4, 6, 0x06060708, 0x09090a07, 0xff, 2, 0}, - {1, 2000, 2, 4, 8, 0x090a0b0d, 0x0e0f110b, 0xff, 2, 0}, - {1, 2133, 2, 4, 8, 0x090a0b0d, 0x0e0f110b, 0xff, 2, 0}, + {2, 1200, 2, 5, 7, 0x0808090a, 0x0b0c0c0a}, + {2, 1500, 2, 5, 6, 0x07070809, 0x0a0b0b09}, + {2, 1600, 2, 5, 8, 0x090b0b0d, 0x0d0e0f0b}, + {2, 1700, 2, 4, 7, 0x080a0a0c, 0x0c0d0e0a}, + {2, 1900, 2, 5, 9, 0x0a0b0c0e, 0x0f10120c}, + {2, 2140, 2, 4, 8, 0x090a0b0d, 0x0e0f110b}, + {1, 1200, 2, 5, 7, 0x0808090a, 0x0b0c0c0a}, + {1, 1500, 2, 5, 6, 0x07070809, 0x0a0b0b09}, + {1, 1600, 2, 5, 8, 0x090b0b0d, 0x0d0e0f0b}, + {1, 1700, 2, 4, 7, 0x080a0a0c, 0x0c0d0e0a}, + {1, 1900, 2, 5, 9, 0x0a0b0c0e, 0x0f10120c}, + {1, 2140, 2, 4, 8, 0x090a0b0d, 0x0e0f110b}, {} }; static const struct board_specific_parameters rdimm0[] = { /* * memory controller 0 - * num| hi| rank| clk| wrlvl | wrlvl | wrlvl | cpo |wrdata|2T - * ranks| mhz| GB |adjst| start | ctl2 | ctl3 | |delay | + * num| hi| rank| clk| wrlvl | wrlvl | wrlvl | + * ranks| mhz| GB |adjst| start | ctl2 | ctl3 | */ - {4, 1350, 0, 5, 9, 0x08070605, 0x06070806, 0xff, 2, 0}, - {4, 1666, 0, 5, 11, 0x0a080706, 0x07090906, 0xff, 2, 0}, - {4, 2140, 0, 5, 12, 0x0b090807, 0x080a0b07, 0xff, 2, 0}, - {2, 1350, 0, 5, 9, 0x08070605, 0x06070806, 0xff, 2, 0}, - {2, 1666, 0, 5, 11, 0x0a090806, 0x08090a06, 0xff, 2, 0}, - {2, 2140, 0, 5, 12, 0x0b090807, 0x080a0b07, 0xff, 2, 0}, - {1, 1350, 0, 5, 9, 0x08070605, 0x06070806, 0xff, 2, 0}, - {1, 1666, 0, 5, 11, 0x0a090806, 0x08090a06, 0xff, 2, 0}, - {1, 2140, 0, 4, 12, 0x0b090807, 0x080a0b07, 0xff, 2, 0}, + /* TODO: need tuning these parameters if RDIMM is used */ + {4, 1350, 0, 5, 9, 0x08070605, 0x06070806}, + {4, 1666, 0, 5, 11, 0x0a080706, 0x07090906}, + {4, 2140, 0, 5, 12, 0x0b090807, 0x080a0b07}, + {2, 1350, 0, 5, 9, 0x08070605, 0x06070806}, + {2, 1666, 0, 5, 11, 0x0a090806, 0x08090a06}, + {2, 2140, 0, 5, 12, 0x0b090807, 0x080a0b07}, + {1, 1350, 0, 5, 9, 0x08070605, 0x06070806}, + {1, 1666, 0, 5, 11, 0x0a090806, 0x08090a06}, + {1, 2140, 0, 4, 12, 0x0b090807, 0x080a0b07}, {} }; -/* - * The three slots have slightly different timing. The center values are good - * for all slots. We use identical speed tables for them. In future use, if - * DIMMs require separated tables, make more entries as needed. - */ static const struct board_specific_parameters *udimms[] = { udimm0, }; -/* - * The three slots have slightly different timing. See comments above. - */ static const struct board_specific_parameters *rdimms[] = { rdimm0, }; - - #endif -- 1.8.0

2 1

[U-Boot] linkstation_HGLAN and MPC824x support
by Tom Rini 06 Jan '14

06 Jan '14

Hello, With a recent change to U-Boot (as part of merging http://patchwork.ozlabs.org/patch/293612/), we need cache support for MPC824x, for the linkstation_HGLAN board to continue building, as the network driver is now cache aware. Alternatively, if there is no interest in maintaining the platform upstream anymore, we can remove it. Thanks! -- Tom

3 7

[U-Boot] [PATCH] ARM: HYP/non-sec: Propagate stack pointer to hyp mode
by Ian Campbell 06 Jan '14

06 Jan '14

Some users of the u-boot API (specifically grub) use the initial SP as a hint regarding where to look for the u-boot API signature. Signed-off-by: Ian Campbell <ijc(a)hellion.org.uk> Cc: Marc Zyngier <marc.zyngier(a)arm.com> --- This applies on top of Marc's "ARMv7: add PSCI support to u-boot" and allows me to chainload grub on a cubieboard2. (I don't think that has been applied anywhere yet?) --- arch/arm/cpu/armv7/nonsec_virt.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 6130a37..2c9e097 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -60,6 +60,10 @@ _secure_monitor: #ifdef CONFIG_ARMV7_VIRT orreq r5, r5, #0x100 @ allow HVC instruction moveq r6, #HYP_MODE @ Enter the kernel as HYP + + mrseq r4, sp_svc @ Propagate SP to HYP mode + msreq sp_hyp, r4 @ it serves as a "hint" to + @ find the u-boot API root. #endif mcr p15, 0, r5, c1, c1, 0 @ write SCR (with NS bit set) -- 1.8.4.rc3

2 2

[U-Boot] [PATCH v4 1/3] mx6sabresd: Add eMMC specific environment to allow U-Boot update
by Otavio Salvador 06 Jan '14

06 Jan '14

A new 'update_emmc_firmware' target is added to allow for easy U-Boot update in the eMMC as it has secury boot partition and this needs specific handling on how to program the specific partition. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v4: - Fix compilation error (Stefano) Changes in v3: None Changes in v2: None include/configs/mx6sabre_common.h | 23 +++++++++++++++++++++++ include/configs/mx6sabresd.h | 2 ++ 2 files changed, 25 insertions(+) diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 21c848f..5ee7fa5 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -95,6 +95,28 @@ #define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_TEXT_BASE 0x17800000 +#ifdef CONFIG_SUPPORT_EMMC_BOOT +#define EMMC_ENV \ + "emmcdev=2\0" \ + "update_emmc_firmware=" \ + "if test ${ip_dyn} = yes; then " \ + "setenv get_cmd dhcp; " \ + "else " \ + "setenv get_cmd tftp; " \ + "fi; " \ + "if ${get_cmd} ${update_sd_firmware_filename}; then " \ + "if mmc dev ${emmcdev} && " \ + "mmc open ${emmcdev} 1; then " \ + "setexpr fw_sz ${filesize} / 0x200; " \ + "setexpr fw_sz ${fw_sz} + 1; " \ + "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ + "mmc close ${emmcdev} 1; " \ + "fi; " \ + "fi\0" +#else +#define EMMC_ENV "" +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "uimage=uImage\0" \ @@ -121,6 +143,7 @@ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ "fi; " \ "fi\0" \ + EMMC_ENV \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=${mmcroot}\0" \ "loadbootscript=" \ diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 3229bc7..4919f53 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -23,6 +23,8 @@ #endif #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) +#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ + #include "mx6sabre_common.h" #define CONFIG_SYS_FSL_USDHC_NUM 3 -- 1.8.5.2

3 6

[U-Boot] [PATCH v6 08/12] sf: Discover read dummy_cycles
by Jagannadha Sutradharudu Teki 06 Jan '14

06 Jan '14

Discovered the read dummy_cycles based on the configured read command. Signed-off-by: Jagannadha Sutradharudu Teki <jaganna(a)xilinx.com> --- drivers/mtd/spi/sf_internal.h | 2 ++ drivers/mtd/spi/sf_ops.c | 10 ++++++---- drivers/mtd/spi/sf_probe.c | 12 ++++++++++++ include/spi_flash.h | 2 ++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 7be0292..a9f5a81 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -10,6 +10,8 @@ #ifndef _SF_INTERNAL_H_ #define _SF_INTERNAL_H_ +#define SPI_FLASH_3B_ADDR_LEN 3 +#define SPI_FLASH_CMD_LEN (1 + SPI_FLASH_3B_ADDR_LEN) #define SPI_FLASH_16MB_BOUN 0x1000000 /* CFI Manufacture ID's */ diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 827f719..dda75b1 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -9,6 +9,7 @@ */ #include <common.h> +#include <malloc.h> #include <spi.h> #include <spi_flash.h> #include <watchdog.h> @@ -216,7 +217,7 @@ int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd, int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len) { u32 erase_size; - u8 cmd[4]; + u8 cmd[SPI_FLASH_CMD_LEN]; int ret = -1; erase_size = flash->erase_size; @@ -255,7 +256,7 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset, { unsigned long byte_addr, page_size; size_t chunk_len, actual; - u8 cmd[4]; + u8 cmd[SPI_FLASH_CMD_LEN]; int ret = -1; page_size = flash->page_size; @@ -317,7 +318,7 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd, int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, size_t len, void *data) { - u8 cmd[5], bank_sel = 0; + u8 *cmd, bank_sel = 0; u32 remain_len, read_len; int ret = -1; @@ -335,8 +336,9 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset, return 0; } + cmd = malloc(SPI_FLASH_CMD_LEN + flash->dummy_cycles); + memset(cmd, 0, SPI_FLASH_CMD_LEN + flash->dummy_cycles); cmd[0] = flash->read_cmd; - cmd[4] = 0x00; while (len) { #ifdef CONFIG_SPI_FLASH_BAR diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index a049e72..b070adc 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -140,6 +140,18 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, } } + /* Read dummy cycles */ + switch (flash->read_cmd) { + case CMD_READ_QUAD_IO_FAST: + flash->dummy_cycles = 2; + break; + case CMD_READ_ARRAY_SLOW: + flash->dummy_cycles = 0; + break; + default: + flash->dummy_cycles = 1; + } + /* Poll cmd seclection */ flash->poll_cmd = CMD_READ_STATUS; #ifdef CONFIG_SPI_FLASH_STMICRO diff --git a/include/spi_flash.h b/include/spi_flash.h index d24e40a..bdd4141 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -72,6 +72,7 @@ extern const struct spi_flash_params spi_flash_params_table[]; * @erase_cmd: Erase cmd 4K, 32K, 64K * @read_cmd: Read cmd - Array Fast, Extn read and quad read. * @write_cmd: Write cmd - page and quad program. + * @dummy_cycles: Dummy cycles for read operation. * @memory_map: Address of read-only SPI flash access * @read: Flash read ops: Read len bytes at offset into buf * Supported cmds: Fast Array Read @@ -98,6 +99,7 @@ struct spi_flash { u8 erase_cmd; u8 read_cmd; u8 write_cmd; + u8 dummy_cycles; void *memory_map; int (*read)(struct spi_flash *flash, u32 offset, size_t len, void *buf); -- 1.8.3

3 6

[U-Boot] please pull u-boot-samsung master
by Minkyu Kang 06 Jan '14

06 Jan '14

Dear Albert, The following changes since commit 2931fa4db349c97f882ffda42e901208654b5ca9: ARM: AM43xx: Add Maintainer (2013-12-18 21:14:45 -0500) are available in the git repository at: git://git.denx.de/u-boot-samsung master for you to fetch changes up to a5e15bbb42512ee5be53967019e9649816790d7e: board:trats2: fix default partitions and mmc env (2013-12-31 16:41:10 +0900) ---------------------------------------------------------------- Piotr Wilczek (2): board:trats1:trats2: fix adapter number board:trats2: fix default partitions and mmc env Rajeshwari Birje (11): EXYNOS5: Create a common board file Exynos5420: Add base addresses for 5420 EXYNOS5420: Add power register structure. EXYNOS5420: Add dmc and phy_control register structure Exynos5420: Add clock initialization for 5420 Exynos5420: Add DDR3 initialization for 5420 Exynos5420: Add support for 5420 in pinmux and gpio Exynos5420: Add base patch for SMDK5420 DTS: Add dts support for SMDK5420 Config: Add initial config for SMDK5420 SPL: EXYNOS: Prepare for variable size SPL support arch/arm/cpu/armv7/exynos/clock.c | 279 +++++++- arch/arm/cpu/armv7/exynos/clock_init.h | 17 + arch/arm/cpu/armv7/exynos/clock_init_exynos5.c | 352 +++++++++- arch/arm/cpu/armv7/exynos/dmc_common.c | 60 +- arch/arm/cpu/armv7/exynos/dmc_init_ddr3.c | 439 ++++++++++++- arch/arm/cpu/armv7/exynos/exynos5_setup.h | 764 +++++++++++++++------ arch/arm/cpu/armv7/exynos/pinmux.c | 260 +++++++- arch/arm/dts/exynos5.dtsi | 198 ++++++ arch/arm/dts/exynos5250.dtsi | 194 +----- arch/arm/dts/exynos5420.dtsi | 70 ++ arch/arm/include/asm/arch-exynos/board.h | 17 + arch/arm/include/asm/arch-exynos/clk.h | 1 + arch/arm/include/asm/arch-exynos/clock.h | 494 ++++++++++++++ arch/arm/include/asm/arch-exynos/cpu.h | 52 +- arch/arm/include/asm/arch-exynos/dmc.h | 177 +++++ arch/arm/include/asm/arch-exynos/gpio.h | 143 +++- arch/arm/include/asm/arch-exynos/periph.h | 3 + arch/arm/include/asm/arch-exynos/power.h | 837 ++++++++++++++++++++++++ board/samsung/common/Makefile | 4 + board/samsung/common/board.c | 411 ++++++++++++ board/samsung/dts/exynos5420-smdk5420.dts | 169 +++++ board/samsung/smdk5250/exynos5-dt.c | 350 +--------- board/samsung/smdk5250/smdk5250.c | 182 +----- board/samsung/smdk5420/Makefile | 11 + board/samsung/smdk5420/smdk5420.c | 159 +++++ board/samsung/smdk5420/smdk5420_spl.c | 52 ++ board/samsung/trats/trats.c | 2 +- board/samsung/trats2/trats2.c | 6 +- boards.cfg | 1 + include/configs/arndale.h | 1 + include/configs/exynos5-dt.h | 290 ++++++++ include/configs/exynos5250-dt.h | 284 +------- include/configs/smdk5420.h | 56 ++ include/configs/trats2.h | 3 +- spl/Makefile | 7 +- tools/Makefile | 3 +- tools/mkexynosspl.c | 167 +++-- 37 files changed, 5196 insertions(+), 1319 deletions(-) create mode 100644 arch/arm/dts/exynos5.dtsi create mode 100644 arch/arm/dts/exynos5420.dtsi create mode 100644 arch/arm/include/asm/arch-exynos/board.h create mode 100644 board/samsung/common/board.c create mode 100644 board/samsung/dts/exynos5420-smdk5420.dts create mode 100644 board/samsung/smdk5420/Makefile create mode 100644 board/samsung/smdk5420/smdk5420.c create mode 100644 board/samsung/smdk5420/smdk5420_spl.c create mode 100644 include/configs/exynos5-dt.h create mode 100644 include/configs/smdk5420.h -- Happy New Year! Thanks, Minkyu Kang.

2 1

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

06 Jan '14

Hi Albert, my first pull-request in 2014 ! Please pull from u-boot-imx, thanks ! The following changes since commit 56eb3da43fab5990a4b7bc118b76c7cae2ceb140: arm, am335x: update for the siemens boards (2013-11-12 09:53:59 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 02229827804980e3cce48bf4fce43699046bcf7e: mx6: soc: Disable VDDPU regulator (2014-01-02 17:16:51 +0100) ---------------------------------------------------------------- Eric Nelson (8): i.MX6DQ/DLS: replace pad names with their Linux kernel equivalents i.MX6DQ/DLS: remove useless mux/pad declarations i.MX6DQ: Add Pinmux settings that are present in mainline and Dual-Lite/Solo i.MX6DQ/DLS: remove unused pad declarations i.MX6DQ/DLS: whitespace: Align IOMUX_PAD column in declarations imx-common: remove extraneous semicolon from macro i.MX6 (DQ/DLS): use macros for mux and pad declarations ARM: mx6: Update non-Freescale boards to include CPU errata. Fabio Estevam (24): configs: imx: Make CONFIG_SYS_PROMPT uniform across FSL boards wandboard: Return the error immediately when ipuv3_fb_init() fails wandboard: Return the error when cpu_eth_init() fails titanium: Return the error when cpu_eth_init() fails nitrogen6x: Remove unused OCOTP options mx51evk: Fix pmic_init() argument mx31pdk: Fix pmic_init() argument efikamx: Fix pmic_init() argument power: power_fsl: Pass p->bus in the same way for SPI and I2C cases mx6sabresd: Fix wrong colors in LVDS splash mx6sabresd: Add SPI NOR support imx: Explicitly pass the I2C bus number in pmic_init() configs: imx: Remove CONFIG_SYS_SPD_BUS_NUM option mx6: clock: Fix the calculation of PLL_ENET frequency mx6sabresd: Allow probing HSYNC, VSYNC and DISP_CLK signals mx6sabresd: Fix LVDS width and color format doc: README.fuse: Add an example on how to use the fuse API on mx6q mx6sabre_common.h: Add CONFIG_CMD_FUSE support mx6: soc: Staticize set_vddsoc() mx6: soc: Clear the LDO ramp values up prior to setting the LDO voltages mx6: soc: Set the VDDSOC at 1.175 V mx6: soc: Introduce set_ldo_voltage() mx6: soc: Add the required LDO ramp up delay mx6: soc: Disable VDDPU regulator Frank Li (1): imx6: fix random hang when download by usb Giuseppe Pagano (5): udoo: Move and optimize platform register setting. udoo: Add ethernet support (FEC + Micrel KSZ9031). udoo: Fix watchdog during kernel boot. nitrogen6x: Move setup_sata to common part udoo: Add SATA support on uDoo Board. Liu Ying (1): MX6 SabreSD: Use readl() to read the CCM_CCGR3 register Marek Vasut (3): Net: FEC: Fix huge memory leak ARM: mx53: video: Add IPUv3 LCD support for M53EVK ARM: mxs: tools: Fix errno handling in strtoul() invocation Michael Heimpold (1): mxs_gpio: fix the handling in gpio_direction_output() Stefan Roese (1): mx6: titanium: Move BSP code to barco board directory Stefano Babic (1): MX6: fix sata compilation for i.MX6 arch/arm/cpu/armv7/mx6/clock.c | 2 +- arch/arm/cpu/armv7/mx6/soc.c | 110 +- arch/arm/imx-common/Makefile | 3 + arch/arm/imx-common/cpu.c | 4 +- arch/arm/imx-common/sata.c | 34 + arch/arm/include/asm/arch-mx6/crm_regs.h | 1 + arch/arm/include/asm/arch-mx6/imx-regs.h | 23 + arch/arm/include/asm/arch-mx6/mx6-pins.h | 33 +- arch/arm/include/asm/arch-mx6/mx6dl_pins.h | 2728 +++++++++------------- arch/arm/include/asm/arch-mx6/mx6q_pins.h | 2642 ++++++++------------- arch/arm/include/asm/arch-mx6/sys_proto.h | 2 - arch/arm/include/asm/imx-common/sata.h | 16 + board/{freescale => barco}/titanium/Makefile | 0 board/{freescale => barco}/titanium/imximage.cfg | 0 board/{freescale => barco}/titanium/titanium.c | 110 +- board/boundary/nitrogen6x/nitrogen6x.c | 197 +- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 40 +- board/denx/m53evk/m53evk.c | 73 + board/freescale/mx25pdk/mx25pdk.c | 2 +- board/freescale/mx31pdk/mx31pdk.c | 2 +- board/freescale/mx35pdk/mx35pdk.c | 2 +- board/freescale/mx51evk/mx51evk.c | 2 +- board/freescale/mx53evk/mx53evk.c | 2 +- board/freescale/mx53loco/mx53loco.c | 2 +- board/freescale/mx6qarm2/mx6qarm2.c | 68 +- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 62 +- board/freescale/mx6sabresd/mx6sabresd.c | 155 +- board/genesi/mx51_efikamx/efikamx.c | 2 +- board/udoo/1066mhz_4x256mx16.cfg | 55 + board/udoo/clocks.cfg | 32 + board/udoo/ddr-setup.cfg | 87 + board/udoo/udoo.c | 165 +- board/udoo/udoo.cfg | 29 + board/wandboard/wandboard.c | 60 +- boards.cfg | 4 +- doc/README.imx6 | 76 + drivers/gpio/mxs_gpio.c | 4 +- drivers/net/fec_mxc.c | 177 +- drivers/power/power_fsl.c | 3 +- include/configs/imx31_phycore.h | 1 - include/configs/m53evk.h | 16 + include/configs/mx25pdk.h | 2 - include/configs/mx28evk.h | 1 - include/configs/mx31pdk.h | 1 - include/configs/mx35pdk.h | 2 - include/configs/mx51evk.h | 1 - include/configs/mx53ard.h | 1 - include/configs/mx53evk.h | 2 - include/configs/mx53loco.h | 2 - include/configs/mx53smd.h | 2 - include/configs/mx6_common.h | 1 + include/configs/mx6qarm2.h | 1 - include/configs/mx6sabre_common.h | 18 +- include/configs/nitrogen6x.h | 11 +- include/configs/titanium.h | 1 + include/configs/udoo.h | 29 + include/configs/wandboard.h | 1 + include/micrel.h | 5 + tools/mxsimage.c | 1 + 59 files changed, 3346 insertions(+), 3762 deletions(-) create mode 100644 arch/arm/imx-common/sata.c create mode 100644 arch/arm/include/asm/imx-common/sata.h rename board/{freescale => barco}/titanium/Makefile (100%) rename board/{freescale => barco}/titanium/imximage.cfg (100%) rename board/{freescale => barco}/titanium/titanium.c (66%) create mode 100644 board/udoo/1066mhz_4x256mx16.cfg create mode 100644 board/udoo/clocks.cfg create mode 100644 board/udoo/ddr-setup.cfg create mode 100644 board/udoo/udoo.cfg Best 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 =====================================================================

2 2