October 2015 - U-Boot

[U-Boot] [PATCH v4] mmc: atmel: Add atmel sdhci support
by Wenyou Yang 29 Oct '15

29 Oct '15

The SDHCI is introduced by sama5d2, named as Secure Digital Multimedia Card Controller(SDMMC). It supports the embedded MultiMedia Card (e.MMC) Specification V4.41, the SD Memory Card Specification V3.0, and the SDIO V3.0 specification. It is compliant with the SD Host Controller Standard V3.0 specification. Signed-off-by: Wenyou Yang <wenyou.yang(a)atmel.com> --- Changes in v4: 1./ remove unneeded initial value NULL of host. 2./ use calloc() to zero-initialize the buffer, instead of malloc(). 3./ remove unnecessary convert type before host->ioaddr. Changes in v3: 1./ return -ENODEV instead of -1, when failing to get proper clock. 2./ add free host instance when failing to get proper clock. Changes in v2: - According to Bo Shen's comments, 1./ change the macro ATMEL_SDHC_MIN_FRQ -> ATMEL_SDHC_MIN_FREQ. 2./ change the return value to -ENOMEM and print log for malloc failure. 3./ add the failed return and log for getting improper clock. 4./ add more commit log. arch/arm/mach-at91/include/mach/atmel_sdhci.h | 13 ++++++++ drivers/mmc/Makefile | 1 + drivers/mmc/atmel_sdhci.c | 40 +++++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 arch/arm/mach-at91/include/mach/atmel_sdhci.h create mode 100644 drivers/mmc/atmel_sdhci.c diff --git a/arch/arm/mach-at91/include/mach/atmel_sdhci.h b/arch/arm/mach-at91/include/mach/atmel_sdhci.h new file mode 100644 index 0000000..9652bc2 --- /dev/null +++ b/arch/arm/mach-at91/include/mach/atmel_sdhci.h @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2015 Atmel Corporation + * Wenyou.Yang <wenyou.yang(a)atmel.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __ATMEL_SDHCI_H +#define __ATMEL_SDHCI_H + +int atmel_sdhci_init(void *regbase, u32 id); + +#endif diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 99d0295..5d35705 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_DM_MMC) += mmc-uclass.o obj-$(CONFIG_ARM_PL180_MMCI) += arm_pl180_mmci.o +obj-$(CONFIG_ATMEL_SDHCI) += atmel_sdhci.o obj-$(CONFIG_BCM2835_SDHCI) += bcm2835_sdhci.o obj-$(CONFIG_BFIN_SDH) += bfin_sdh.o obj-$(CONFIG_DAVINCI_MMC) += davinci_mmc.o diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c new file mode 100644 index 0000000..1437a21 --- /dev/null +++ b/drivers/mmc/atmel_sdhci.c @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2015 Atmel Corporation + * Wenyou.Yang <wenyou.yang(a)atmel.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <malloc.h> +#include <sdhci.h> +#include <asm/arch/clk.h> + +#define ATMEL_SDHC_MIN_FREQ 400000 + +int atmel_sdhci_init(void *regbase, u32 id) +{ + struct sdhci_host *host; + u32 max_clk, min_clk = ATMEL_SDHC_MIN_FREQ; + + host = (struct sdhci_host *)calloc(sizeof(struct sdhci_host)); + if (!host) { + printf("%s: sdhci_host malloc failed\n", __func__); + return -ENOMEM; + } + + host->name = "atmel_sdhci"; + host->ioaddr = regbase; + host->quirks = 0; + host->version = sdhci_readw(host, SDHCI_HOST_VERSION); + max_clk = at91_get_periph_generated_clk(id); + if (!max_clk) { + printf("%s: Failed to get the proper clock\n", __func__); + free(host); + return -ENODEV; + } + + add_sdhci(host, max_clk, min_clk); + + return 0; +} -- 1.7.9.5

3 2

[U-Boot] Pull request: u-boot-spi/master
by Jagan Teki 29 Oct '15

29 Oct '15

Hi Tom, Please pull this PR, and skip the previous one [1] [1] https://patchwork.ozlabs.org/patch/535548/ thanks! Jagan. The following changes since commit 677f970bc62a661690b3431543d5a5d5e682ba70: common/board_f.c: modify the macro to use get_clocks() more common (2015-10-24 13:50:38 -0400) are available in the git repository at: git://git.denx.de/u-boot-spi.git master for you to fetch changes up to bef87adf95e7ca923f866e27bbcccb2dad85df9f: spi: altera_spi: Minor cleanup (2015-10-28 13:54:09 +0530) ---------------------------------------------------------------- Jagan Teki (51): spi: Add zynq qspi controller driver dts: zynq: Add zynq qspi controller nodes doc: device-tree-bindings: spi: Add zynq qspi info dts: microzed: Enable zynq qspi controller node dts: zc702: Enable zynq qspi controller node dts: zc706: Enable zynq qspi controller node dts: zc770-xm010: Enable zynq qspi controller node dts: zed: Enable zynq qspi controller node configs: Enable legacy SPI flash interface support zynq-common: Enable zynq qspi controller support zynq-common: Enable Bank/Extended address register support configs: zynq: Enable zynq qspi controller spi: Kconfig: Add Zynq QSPI controller entry spi: zynq_spi: Add config reg shift named macros spi: zynq_spi: Rename baudrate divisor mask name spi: zynq_spi: Store cs value into private data sf: params: Add IS25LP032 part support sf: params: Add IS25LP064 part support sf: params: Add IS25LP128 part support zynq-common: Enable ISSI SPI-NOR flash support spi: zynq_qspi: Fix to configure CPOL, CPHA mask spi: zynq_spi: Remove unneeded headers sf: Return bank_sel, if flash->bank_curr == bank_sel sf: Add spi_flash_read_bar sf: Optimize BAR write code sf: Make flash->flags use for generic usage sf: Update status reg check in spi_flash_cmd_wait_ready sf: Add FSR support to spi_flash_cmd_wait_ready spi: zynq_qspi: Minor cleanups spi: zynq_[q]spi: Use BIT macro spi: zynq_[q]spi: Use GENMASK macro spi: atmel_spi: Use BIT macro spi: bfin_spi6xx: Use BIT macro spi: cadence_qspi_apb: Use BIT macro spi: designware_spi: Use BIT macro spi: fsl: Use BIT macro spi: ich: Use BIT macro spi: mpc8xxx_spi: Use BIT macro spi: omap3_spi: Use BIT macro spi: sh_qspi: Use BIT macro spi: tegra: Use BIT macro spi: ti_qspi: Use BIT macro spi: xilinx_spi: Use BIT macro spi: atmel_spi: Use GENMASK spi: designware_spi: Use GENMASK spi: fsl_qspi: Use GENMASK spi: omap3_spi: Use GENMASK spi: tegra: Use GENMASK spi: xilinx_spi: Use GENMASK spi: altera_spi: Use BIT macro spi: altera_spi: Minor cleanup Siva Durga Prasad Paladugu (1): zynq-common: Add SPL SPI offset, size configs arch/arm/dts/zynq-7000.dtsi | 12 + arch/arm/dts/zynq-microzed.dts | 5 + arch/arm/dts/zynq-zc702.dts | 5 + arch/arm/dts/zynq-zc706.dts | 5 + arch/arm/dts/zynq-zc770-xm010.dts | 7 +- arch/arm/dts/zynq-zed.dts | 5 + configs/zynq_microzed_defconfig | 2 + configs/zynq_zc702_defconfig | 2 + configs/zynq_zc706_defconfig | 2 + configs/zynq_zc70x_defconfig | 2 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zed_defconfig | 2 + doc/device-tree-bindings/spi/spi-zynq-qspi.txt | 26 ++ drivers/mtd/spi/sf_internal.h | 5 + drivers/mtd/spi/sf_ops.c | 138 +++--- drivers/mtd/spi/sf_params.c | 5 + drivers/mtd/spi/sf_probe.c | 67 +-- drivers/spi/Kconfig | 9 + drivers/spi/Makefile | 1 + drivers/spi/altera_spi.c | 10 +- drivers/spi/atmel_spi.h | 54 +-- drivers/spi/bfin_spi6xx.c | 8 +- drivers/spi/cadence_qspi_apb.c | 28 +- drivers/spi/designware_spi.c | 16 +- drivers/spi/fsl_dspi.c | 2 +- drivers/spi/fsl_espi.c | 20 +- drivers/spi/fsl_qspi.c | 6 +- drivers/spi/ich.c | 4 +- drivers/spi/mpc8xxx_spi.c | 2 +- drivers/spi/omap3_spi.h | 64 +-- drivers/spi/sh_qspi.c | 16 +- drivers/spi/tegra114_spi.c | 76 +-- drivers/spi/tegra20_sflash.c | 54 +-- drivers/spi/tegra20_slink.c | 62 +-- drivers/spi/ti_qspi.c | 10 +- drivers/spi/xilinx_spi.c | 46 +- drivers/spi/zynq_qspi.c | 621 +++++++++++++++++++++++++ drivers/spi/zynq_spi.c | 46 +- include/configs/zynq-common.h | 15 + include/spi_flash.h | 6 +- 40 files changed, 1101 insertions(+), 366 deletions(-) create mode 100644 doc/device-tree-bindings/spi/spi-zynq-qspi.txt create mode 100644 drivers/spi/zynq_qspi.c

3 3

[U-Boot] [PATCH] image.c: Fix non-Android booting with ramdisk and/or device tree
by Tom Rini 28 Oct '15

28 Oct '15

In 1fec3c5 I added a check that if we had an Android image we default to trying the kernel address for a ramdisk. However when we don't have an Android image buf is NULL and we oops here. Ensure that we have 'buf' to check first. Reported-by: elipe Balbi <balbi(a)ti.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- common/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/image.c b/common/image.c index e607109..85c4f39 100644 --- a/common/image.c +++ b/common/image.c @@ -913,7 +913,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, * Look for an Android boot image. */ buf = map_sysmem(images->os.start, 0); - if (genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) + if (buf && genimg_get_format(buf) == IMAGE_FORMAT_ANDROID) select = argv[0]; #endif -- 1.7.9.5

1 1

[U-Boot] Please pull from u-boot-i2c
by Heiko Schocher 28 Oct '15

28 Oct '15

Hello Tom, please pull from u-boot-i2c.git master The following changes since commit 677f970bc62a661690b3431543d5a5d5e682ba70: common/board_f.c: modify the macro to use get_clocks() more common (2015-10-24 13:50:38 -0400) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to 009902a871dcb1ad60e746280372f47d90f65353: i2c: Instantiate I2C controllers when selected (2015-10-28 09:53:49 +0100) ---------------------------------------------------------------- Michal Simek (1): i2c: Instantiate I2C controllers when selected drivers/i2c/zynq_i2c.c | 4 ++++ 1 file changed, 4 insertions(+) bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] Please pull u-boot-ppc4xx
by Stefan Roese 28 Oct '15

28 Oct '15

Hi Tom, please pull the 4 4xx removal patches. The following changes since commit 677f970bc62a661690b3431543d5a5d5e682ba70: common/board_f.c: modify the macro to use get_clocks() more common (2015-10-24 13:50:38 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git for you to fetch changes up to 29155e735203b28951d0e836f13773defa6e6118: ocotea: Drop (2015-10-27 12:34:09 +0100) ---------------------------------------------------------------- Tom Rini (4): taihu: Remove ebony: Drop taishan: Drop ocotea: Drop board/amcc/ebony/Kconfig | 16 - board/amcc/ebony/MAINTAINERS | 6 - board/amcc/ebony/Makefile | 9 - board/amcc/ebony/README | 136 --- board/amcc/ebony/config.mk | 16 - board/amcc/ebony/ebony.c | 151 ---- board/amcc/ebony/flash.c | 155 ---- board/amcc/ebony/init.S | 41 - board/amcc/ocotea/Kconfig | 16 - board/amcc/ocotea/MAINTAINERS | 6 - board/amcc/ocotea/Makefile | 9 - board/amcc/ocotea/README.ocotea | 73 -- board/amcc/ocotea/README.ocotea-PIBS-to-U-Boot | 99 --- board/amcc/ocotea/config.mk | 20 - board/amcc/ocotea/flash.c | 134 --- board/amcc/ocotea/init.S | 42 - board/amcc/ocotea/ocotea.c | 387 --------- board/amcc/ocotea/ocotea.h | 125 --- board/amcc/taihu/Kconfig | 16 - board/amcc/taihu/MAINTAINERS | 6 - board/amcc/taihu/Makefile | 8 - board/amcc/taihu/flash.c | 1063 ------------------------ board/amcc/taihu/lcd.c | 237 ------ board/amcc/taihu/taihu.c | 180 ---- board/amcc/taihu/update.c | 116 --- board/amcc/taishan/Kconfig | 16 - board/amcc/taishan/MAINTAINERS | 6 - board/amcc/taishan/Makefile | 9 - board/amcc/taishan/config.mk | 20 - board/amcc/taishan/init.S | 35 - board/amcc/taishan/lcd.c | 358 -------- board/amcc/taishan/showinfo.c | 220 ----- board/amcc/taishan/taishan.c | 201 ----- board/amcc/taishan/update.c | 62 -- configs/ebony_defconfig | 3 - configs/ocotea_defconfig | 3 - configs/taihu_defconfig | 3 - configs/taishan_defconfig | 3 - doc/README.scrapyard | 4 + include/configs/ebony.h | 174 ---- include/configs/ocotea.h | 194 ----- include/configs/taihu.h | 307 ------- include/configs/taishan.h | 193 ----- 43 files changed, 4 insertions(+), 4874 deletions(-) delete mode 100644 board/amcc/ebony/Kconfig delete mode 100644 board/amcc/ebony/MAINTAINERS delete mode 100644 board/amcc/ebony/Makefile delete mode 100644 board/amcc/ebony/README delete mode 100644 board/amcc/ebony/config.mk delete mode 100644 board/amcc/ebony/ebony.c delete mode 100644 board/amcc/ebony/flash.c delete mode 100644 board/amcc/ebony/init.S delete mode 100644 board/amcc/ocotea/Kconfig delete mode 100644 board/amcc/ocotea/MAINTAINERS delete mode 100644 board/amcc/ocotea/Makefile delete mode 100644 board/amcc/ocotea/README.ocotea delete mode 100644 board/amcc/ocotea/README.ocotea-PIBS-to-U-Boot delete mode 100644 board/amcc/ocotea/config.mk delete mode 100644 board/amcc/ocotea/flash.c delete mode 100644 board/amcc/ocotea/init.S delete mode 100644 board/amcc/ocotea/ocotea.c delete mode 100644 board/amcc/ocotea/ocotea.h delete mode 100644 board/amcc/taihu/Kconfig delete mode 100644 board/amcc/taihu/MAINTAINERS delete mode 100644 board/amcc/taihu/Makefile delete mode 100644 board/amcc/taihu/flash.c delete mode 100644 board/amcc/taihu/lcd.c delete mode 100644 board/amcc/taihu/taihu.c delete mode 100644 board/amcc/taihu/update.c delete mode 100644 board/amcc/taishan/Kconfig delete mode 100644 board/amcc/taishan/MAINTAINERS delete mode 100644 board/amcc/taishan/Makefile delete mode 100644 board/amcc/taishan/config.mk delete mode 100644 board/amcc/taishan/init.S delete mode 100644 board/amcc/taishan/lcd.c delete mode 100644 board/amcc/taishan/showinfo.c delete mode 100644 board/amcc/taishan/taishan.c delete mode 100644 board/amcc/taishan/update.c delete mode 100644 configs/ebony_defconfig delete mode 100644 configs/ocotea_defconfig delete mode 100644 configs/taihu_defconfig delete mode 100644 configs/taishan_defconfig delete mode 100644 include/configs/ebony.h delete mode 100644 include/configs/ocotea.h delete mode 100644 include/configs/taihu.h delete mode 100644 include/configs/taishan.h

2 1

[U-Boot] Please pull u-boot-cfi-flash
by Stefan Roese 28 Oct '15

28 Oct '15

Hi Tom, please pull the following patch. The following changes since commit 677f970bc62a661690b3431543d5a5d5e682ba70: common/board_f.c: modify the macro to use get_clocks() more common (2015-10-24 13:50:38 -0400) are available in the git repository at: git://www.denx.de/git/u-boot-cfi-flash.git for you to fetch changes up to 622b95274e4d699f3c713c325e958565312625ad: cfi_flash: use specific width types for cword (2015-10-27 11:51:53 +0100) ---------------------------------------------------------------- Ryan Harkin (1): cfi_flash: use specific width types for cword drivers/mtd/cfi_flash.c | 82 ++++++++++++++++++++++++------------------------- include/mtd/cfi_flash.h | 8 ++--- 2 files changed, 45 insertions(+), 45 deletions(-)

2 1

[U-Boot] Please pull u-boot-dm
by Simon Glass 28 Oct '15

28 Oct '15

Hi Tom, The following changes since commit 9f13b6d147dc74f2400ce18d9d4005ba53f21fd3: ARM: AM335x: mux: change mmc0 cd pinmux from mmc0_sdcd to gpio (2015-10-22 14:44:03 -0400) are available in the git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to 4ea5243a3a2fbc59bbcdd401d75f1744bcd6280f: fdt: fix fdtdec_get_pci_addr() for CONFIG_PHYS_64BIT (2015-10-23 09:42:28 -0600) ---------------------------------------------------------------- Christophe Ricard (4): dm: tpm: Move tpm_tis_i2c to tpm_i2c_infineon dm: tpm: Add Driver Model support for tpm_atmel_twi driver dm: tpm: Remove every compilation switch for TPM driver model dm: tpm: Every TPM drivers should depends on DM_TPM Simon Glass (7): dm: Rename dev_get_parentdata() to dev_get_parent_priv() dm: core: Adjust device.h header file order dm: core: Fix device flag whitespace dm: core: Tidy up devres comments dm: core: Remove a comment about dropping per_child_auto_alloc_size dm: core: Tidy up comments in device.h dm: tpm: Drop CONFIG_DM_TPM Stephen Warren (1): fdt: fix fdtdec_get_pci_addr() for CONFIG_PHYS_64BIT Thomas Chou (1): env: export fdt_blob to the environment variable README | 4 +- common/board_r.c | 3 + common/cmd_tpm.c | 13 +-- common/cmd_usb.c | 10 +- common/usb_hub.c | 4 +- common/usb_storage.c | 2 +- .../controlcenterd_36BIT_SDCARD_DEVELOP_defconfig | 2 + configs/controlcenterd_36BIT_SDCARD_defconfig | 2 + .../controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 2 + configs/controlcenterd_TRAILBLAZER_defconfig | 2 + configs/nyan-big_defconfig | 2 +- configs/peach-pi_defconfig | 2 +- configs/peach-pit_defconfig | 2 +- configs/snow_defconfig | 2 +- configs/spring_defconfig | 2 +- doc/README.fdt-control | 5 +- doc/driver-model/usb-info.txt | 4 +- drivers/core/device.c | 2 +- drivers/misc/cros_ec_spi.c | 4 +- drivers/mtd/spi/sf_dataflash.c | 2 +- drivers/mtd/spi/sf_probe.c | 2 +- drivers/spi/fsl_qspi.c | 2 +- drivers/spi/ich.c | 2 +- drivers/spi/soft_spi.c | 2 +- drivers/spi/spi-uclass.c | 8 +- drivers/tpm/Kconfig | 15 +-- drivers/tpm/Makefile | 4 +- drivers/tpm/tpm_atmel_twi.c | 68 ++++++++---- drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} | 5 +- drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} | 0 drivers/tpm/tpm_tis_lpc.c | 1 - drivers/usb/eth/smsc95xx.c | 4 +- drivers/usb/eth/usb_ether.c | 2 +- drivers/usb/host/ehci-hcd.c | 6 +- drivers/usb/host/usb-uclass.c | 8 +- drivers/usb/host/xhci.c | 4 +- drivers/usb/musb-new/usb-compat.h | 10 +- include/dm/device.h | 119 +++++++++++---------- include/pci.h | 2 +- include/spi.h | 2 +- include/tis.h | 60 ----------- include/tpm.h | 6 -- include/usb.h | 2 +- lib/Kconfig | 1 + lib/fdtdec.c | 14 +-- lib/tpm.c | 20 +--- test/dm/bus.c | 26 ++--- 47 files changed, 209 insertions(+), 257 deletions(-) rename drivers/tpm/{tpm_tis_i2c.c => tpm_tis_infineon.c} (99%) rename drivers/tpm/{tpm_tis_i2c.h => tpm_tis_infineon.h} (100%) delete mode 100644 include/tis.h Regards, Simon

2 1

[U-Boot] [PATCH v3 1/6] cgtqmx6eval: Add SPI NOR flash support
by Otavio Salvador 28 Oct '15

28 Oct '15

Add SPI NOR support: => sf probe SF: Detected SST25VF032B with page size 256 Bytes, erase size 4 KiB, total 4 MiB Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 23 +++++++++++++++++++++++ include/configs/cgtqmx6eval.h | 12 ++++++++++++ 2 files changed, 35 insertions(+) diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c index cf5607b..18e408b 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -45,6 +45,10 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ PAD_CTL_ODE | PAD_CTL_SRE_FAST) +#define SPI_PAD_CTRL (PAD_CTL_HYS | \ + PAD_CTL_SPEED_MED | \ + PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) + #define MX6Q_QMX6_PFUZE_MUX IMX_GPIO_NR(6, 9) @@ -152,6 +156,13 @@ static iomux_v3_cfg_t enet_pads_ar8035[] = { MX6_PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL), }; +static iomux_v3_cfg_t const ecspi1_pads[] = { + MX6_PAD_EIM_D16__ECSPI1_SCLK | MUX_PAD_CTRL(SPI_PAD_CTRL), + MX6_PAD_EIM_D17__ECSPI1_MISO | MUX_PAD_CTRL(SPI_PAD_CTRL), + MX6_PAD_EIM_D18__ECSPI1_MOSI | MUX_PAD_CTRL(SPI_PAD_CTRL), + MX6_PAD_EIM_D19__GPIO3_IO19 | MUX_PAD_CTRL(NO_PAD_CTRL), +}; + #define PC MUX_PAD_CTRL(I2C_PAD_CTRL) struct i2c_pads_info i2c_pad_info1 = { .scl = { @@ -381,6 +392,12 @@ static void setup_iomux_uart(void) imx_iomux_v3_setup_multiple_pads(uart2_pads, ARRAY_SIZE(uart2_pads)); } +void setup_spinor(void) +{ + imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads)); + gpio_direction_output(IMX_GPIO_NR(3, 19), 0); +} + #ifdef CONFIG_FSL_ESDHC static struct fsl_esdhc_cfg usdhc_cfg[] = { {USDHC2_BASE_ADDR}, @@ -646,6 +663,7 @@ int board_early_init_f(void) { setup_iomux_uart(); setup_display(); + setup_spinor(); return 0; } @@ -671,6 +689,11 @@ int checkboard(void) return 0; } +int board_spi_cs_gpio(unsigned bus, unsigned cs) +{ + return (bus == 0 && cs == 0) ? (IMX_GPIO_NR(3, 19)) : -EINVAL; +} + #ifdef CONFIG_CMD_BMODE static const struct boot_mode board_boot_modes[] = { /* 4 bit bus width */ diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index e0aa4b0..9aa66c7 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -29,6 +29,16 @@ /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 +/* SPI NOR */ +#define CONFIG_CMD_SF +#define CONFIG_SPI_FLASH +#define CONFIG_SPI_FLASH_STMICRO +#define CONFIG_SPI_FLASH_SST +#define CONFIG_MXC_SPI +#define CONFIG_SF_DEFAULT_BUS 0 +#define CONFIG_SF_DEFAULT_SPEED 20000000 +#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) + /* Miscellaneous commands */ #define CONFIG_CMD_BMODE @@ -200,8 +210,10 @@ "else " \ "bootz; " \ "fi;\0" \ + "spilock=sf probe && sf protect lock 0x3f0000 0x10000;"\ #define CONFIG_BOOTCOMMAND \ + "run spilock;" \ "mmc dev ${mmcdev};" \ "if mmc rescan; then " \ "if run loadbootscript; then " \ -- 2.6.2

2 6

[U-Boot] [PATCH 1/3] sf: Add dm_spi_flash_probe
by Jagan Teki 28 Oct '15

28 Oct '15

Updated dm-spi-flash probe using dm_spi_flash_probe. Signed-off-by: Jagan Teki <jteki(a)openedev.com> Cc: Simon Glass <sjg(a)chromium.org> --- common/cmd_sf.c | 23 ++++------------------- drivers/mtd/spi/sf-uclass.c | 27 ++++++++++++++++++++++++++- include/spi_flash.h | 5 ++--- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/common/cmd_sf.c b/common/cmd_sf.c index ac7f5df..f1926e3 100644 --- a/common/cmd_sf.c +++ b/common/cmd_sf.c @@ -8,7 +8,6 @@ #include <common.h> #include <div64.h> -#include <dm.h> #include <malloc.h> #include <mapmem.h> #include <spi.h> @@ -17,7 +16,6 @@ #include <linux/mtd/mtd.h> #include <asm/io.h> -#include <dm/device-internal.h> static struct spi_flash *flash; @@ -85,10 +83,7 @@ static int do_spi_flash_probe(int argc, char * const argv[]) unsigned int speed = CONFIG_SF_DEFAULT_SPEED; unsigned int mode = CONFIG_SF_DEFAULT_MODE; char *endp; -#ifdef CONFIG_DM_SPI_FLASH - struct udevice *new, *bus_dev; - int ret; -#else +#ifndef CONFIG_DM_SPI_FLASH struct spi_flash *new; #endif @@ -119,21 +114,11 @@ static int do_spi_flash_probe(int argc, char * const argv[]) } #ifdef CONFIG_DM_SPI_FLASH - /* Remove the old device, otherwise probe will just be a nop */ - ret = spi_find_bus_and_cs(bus, cs, &bus_dev, &new); - if (!ret) { - device_remove(new); - device_unbind(new); - } - flash = NULL; - ret = spi_flash_probe_bus_cs(bus, cs, speed, mode, &new); - if (ret) { - printf("Failed to initialize SPI flash at %u:%u (error %d)\n", - bus, cs, ret); + flash = dm_spi_flash_probe(bus, cs, speed, mode); + if (!flash) { + printf("Failed to initialize SPI flash at %u:%u\n", bus, cs); return 1; } - - flash = dev_get_uclass_priv(new); #else if (flash) spi_flash_free(flash); diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index 350e21a..9c109fa 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -47,7 +47,7 @@ void spi_flash_free(struct spi_flash *flash) spi_flash_remove(flash->spi->dev); } -int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, +static int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, unsigned int max_hz, unsigned int spi_mode, struct udevice **devp) { @@ -67,6 +67,31 @@ int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, return 0; } +struct spi_flash *dm_spi_flash_probe(unsigned int busnum, unsigned int cs, + unsigned int max_hz, unsigned int spi_mode) +{ + struct udevice *bus, *new; + struct spi_flash *flash; + int ret; + + /* Remove the old device, otherwise probe will just be a nop */ + ret = spi_find_bus_and_cs(busnum, cs, &bus, &new); + if (!ret) { + device_remove(new); + device_unbind(new); + } + flash = NULL; + + ret = spi_flash_probe_bus_cs(busnum, cs, max_hz, spi_mode, &new); + if (ret) { + printf("Failed to initialize SPI flash at %u:%u (error %d)\n", + busnum, cs, ret); + return flash; + } + + return dev_get_uclass_priv(new); +} + int spi_flash_remove(struct udevice *dev) { return device_remove(dev); diff --git a/include/spi_flash.h b/include/spi_flash.h index 3b2d555..5abbf99 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -154,9 +154,8 @@ int spi_flash_write_dm(struct udevice *dev, u32 offset, size_t len, */ int spi_flash_erase_dm(struct udevice *dev, u32 offset, size_t len); -int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, - unsigned int max_hz, unsigned int spi_mode, - struct udevice **devp); +struct spi_flash *dm_spi_flash_probe(unsigned int busnum, unsigned int cs, + unsigned int max_hz, unsigned int spi_mode); /* Compatibility function - this is the old U-Boot API */ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, -- 1.9.1

2 6

[U-Boot] dump boot1 when boot off sdhc?
by Pavel Tkatchouk 28 Oct '15

28 Oct '15

Hello, With NAND support added in 2015.10, is it possible now to dump boot1 when booting off sd card? What would be the command? Thanks.

1 0