January 2017 - U-Boot

[U-Boot] [PATCH v2] mmc: sdhci-cadence: add Cadence SD4HC support
by Masahiro Yamada 03 Jan '17

03 Jan '17

Add a driver for the Cadence SD4HC SD/SDIO/eMMC Controller. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- Changes in v2: - Remove unneeded version setting - Add SoC specific compatible "socionext,uniphier-sd4hc" - Add "depends on BLK && DM_MMC_OPS && MMC_SDHCI" drivers/mmc/Kconfig | 12 +++++ drivers/mmc/Makefile | 1 + drivers/mmc/sdhci-cadence.c | 125 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+) create mode 100644 drivers/mmc/sdhci-cadence.c diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 2ba1254..ff4344f 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -159,6 +159,18 @@ config MMC_SDHCI_BCM2835 If unsure, say N. +config MMC_SDHCI_CADENCE + bool "SDHCI support for the Cadence SD/SDIO/eMMC controller" + depends on BLK && DM_MMC_OPS + depends on MMC_SDHCI + depends on OF_CONTROL + help + This selects the Cadence SD/SDIO/eMMC driver. + + If you have a controller with this interface, say Y here. + + If unsure, say N. + config MMC_SDHCI_KONA bool "SDHCI support on Broadcom KONA platform" depends on MMC_SDHCI diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 2b136ea..a543188 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -64,6 +64,7 @@ obj-$(CONFIG_MSM_SDHCI) += msm_sdhci.o # SDHCI obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_BCM2835) += bcm2835_sdhci.o +obj-$(CONFIG_MMC_SDHCI_CADENCE) += sdhci-cadence.o obj-$(CONFIG_MMC_SDHCI_KONA) += kona_sdhci.o obj-$(CONFIG_MMC_SDHCI_MV) += mv_sdhci.o obj-$(CONFIG_MMC_SDHCI_S5P) += s5p_sdhci.o diff --git a/drivers/mmc/sdhci-cadence.c b/drivers/mmc/sdhci-cadence.c new file mode 100644 index 0000000..2253bbc --- /dev/null +++ b/drivers/mmc/sdhci-cadence.c @@ -0,0 +1,125 @@ +/* + * Copyright (C) 2016 Socionext Inc. + * Author: Masahiro Yamada <yamada.masahiro(a)socionext.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <linux/io.h> +#include <linux/sizes.h> +#include <dm/device.h> +#include <mmc.h> +#include <sdhci.h> + +/* HRS - Host Register Set (specific to Cadence) */ +#define SDHCI_CDNS_HRS04 0x10 /* PHY access port */ +#define SDHCI_CDNS_HRS04_ACK BIT(26) +#define SDHCI_CDNS_HRS04_RD BIT(25) +#define SDHCI_CDNS_HRS04_WR BIT(24) +#define SDHCI_CDNS_HRS04_RDATA_SHIFT 12 +#define SDHCI_CDNS_HRS04_WDATA_SHIFT 8 +#define SDHCI_CDNS_HRS04_ADDR_SHIFT 0 + +/* SRS - Slot Register Set (SDHCI-compatible) */ +#define SDHCI_CDNS_SRS_BASE 0x200 + +/* PHY */ +#define SDHCI_CDNS_PHY_DLY_SD_HS 0x00 +#define SDHCI_CDNS_PHY_DLY_SD_DEFAULT 0x01 +#define SDHCI_CDNS_PHY_DLY_UHS_SDR12 0x02 +#define SDHCI_CDNS_PHY_DLY_UHS_SDR25 0x03 +#define SDHCI_CDNS_PHY_DLY_UHS_SDR50 0x04 +#define SDHCI_CDNS_PHY_DLY_UHS_DDR50 0x05 +#define SDHCI_CDNS_PHY_DLY_EMMC_LEGACY 0x06 +#define SDHCI_CDNS_PHY_DLY_EMMC_SDR 0x07 +#define SDHCI_CDNS_PHY_DLY_EMMC_DDR 0x08 + +struct sdhci_cdns_plat { + struct mmc_config cfg; + struct mmc mmc; + void __iomem *hrs_addr; +}; + +static void sdhci_cdns_write_phy_reg(struct sdhci_cdns_plat *plat, + u8 addr, u8 data) +{ + void __iomem *reg = plat->hrs_addr + SDHCI_CDNS_HRS04; + u32 tmp; + + tmp = (data << SDHCI_CDNS_HRS04_WDATA_SHIFT) | + (addr << SDHCI_CDNS_HRS04_ADDR_SHIFT); + writel(tmp, reg); + + tmp |= SDHCI_CDNS_HRS04_WR; + writel(tmp, reg); + + tmp &= ~SDHCI_CDNS_HRS04_WR; + writel(tmp, reg); +} + +static void sdhci_cdns_phy_init(struct sdhci_cdns_plat *plat) +{ + sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_SD_HS, 4); + sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_SD_DEFAULT, 4); + sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_EMMC_LEGACY, 9); + sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_EMMC_SDR, 2); + sdhci_cdns_write_phy_reg(plat, SDHCI_CDNS_PHY_DLY_EMMC_DDR, 3); +} + +static int sdhci_cdns_bind(struct udevice *dev) +{ + struct sdhci_cdns_plat *plat = dev_get_platdata(dev); + + return sdhci_bind(dev, &plat->mmc, &plat->cfg); +} + +static int sdhci_cdns_probe(struct udevice *dev) +{ + struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); + struct sdhci_cdns_plat *plat = dev_get_platdata(dev); + struct sdhci_host *host = dev_get_priv(dev); + fdt_addr_t base; + int ret; + + base = dev_get_addr(dev); + if (base == FDT_ADDR_T_NONE) + return -EINVAL; + + plat->hrs_addr = devm_ioremap(dev, base, SZ_1K); + if (!plat->hrs_addr) + return -ENOMEM; + + host->name = dev->name; + host->ioaddr = plat->hrs_addr + SDHCI_CDNS_SRS_BASE; + host->quirks |= SDHCI_QUIRK_WAIT_SEND_CMD; + + sdhci_cdns_phy_init(plat); + + ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0); + if (ret) + return ret; + + upriv->mmc = &plat->mmc; + host->mmc = &plat->mmc; + host->mmc->priv = host; + + return sdhci_probe(dev); +} + +static const struct udevice_id sdhci_cdns_match[] = { + { .compatible = "socionext,uniphier-sd4hc" }, + { .compatible = "cdns,sd4hc" }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(sdhci_cdns) = { + .name = "sdhci-cdns", + .id = UCLASS_MMC, + .of_match = sdhci_cdns_match, + .bind = sdhci_cdns_bind, + .probe = sdhci_cdns_probe, + .priv_auto_alloc_size = sizeof(struct sdhci_host), + .platdata_auto_alloc_size = sizeof(struct sdhci_cdns_plat), + .ops = &sdhci_ops, +}; -- 2.7.4

2 1

[U-Boot] [ANN] U-Boot v2017.01-rc3 released
by Tom Rini 03 Jan '17

03 Jan '17

Hey all, It's release day and v2017.01-rc3 is out. I'm pretty happy with the state of my queue right now. If there's anything really urgent outstanding still, please speak up. Otherwise I expect things to be quiet in the tree until release, next Monday. Thanks all! -- Tom

1 0

[U-Boot] [PATCH] OMAP3: omap3_logic: Remove display parameter
by Adam Ford 03 Jan '17

03 Jan '17

The display is done in the device tree now, and there is no need to pass 'display' kernel parameter any longer. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index d66b507..b38811e 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -143,7 +143,6 @@ "else run defaultboot; fi\0" \ "defaultboot=run mmcramboot\0" \ "consoledevice=ttyO0\0" \ - "display=15\0" \ "setconsole=setenv console ${consoledevice},${baudrate}n8\0" \ "dump_bootargs=echo 'Bootargs: '; echo $bootargs\0" \ "rotation=0\0" \ @@ -153,7 +152,7 @@ "fi\0" \ "optargs=ignore_loglevel early_printk no_console_suspend\0" \ "addmtdparts=setenv bootargs ${bootargs} ${mtdparts}\0" \ - "common_bootargs=setenv bootargs ${bootargs} display=${display} " \ + "common_bootargs=setenv bootargs ${bootargs} " \ "${optargs};" \ "run addmtdparts; " \ "run vrfb_arg\0" \ -- 2.7.4

2 1

[U-Boot] [PATCH] ARM: OMAP3_LOGIC: Remove ONENAND config options
by Adam Ford 03 Jan '17

03 Jan '17

These boards do not and never have had ONENAND support, so let's remove it. Signed-off-by: Adam Ford <aford173(a)gmail.com> --- include/configs/omap3_logic.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index abce61a..d66b507 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -241,8 +241,6 @@ /* **** PISMO SUPPORT *** */ #if defined(CONFIG_CMD_NAND) #define CONFIG_SYS_FLASH_BASE NAND_BASE -#elif defined(CONFIG_CMD_ONENAND) -#define CONFIG_SYS_FLASH_BASE ONENAND_MAP #endif /* Monitor at start of flash */ @@ -250,7 +248,6 @@ #define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -- 2.7.4

2 1

[U-Boot] [PATCH v2] doc/README.cfi: Update code snippet, and add example.
by Robert P. J. Day 03 Jan '17

03 Jan '17

First, update the code snippet referenced in the README file. And since there are only two boards that override flash_cmd_reset(), might as well show them both. Signed-off-by: Robert P. J. Day <rpjday(a)crashcourse.ca> --- figured since i was there, and there were only two boards in the entire code base that defined their own flash_cmd_reset(), might as well show them both. anything else worth adding to this README? or is there any code simplification that could be done to remove even these exceptional cases? diff --git a/doc/README.cfi b/doc/README.cfi index 81e7cf1..ad52850 100644 --- a/doc/README.cfi +++ b/doc/README.cfi @@ -1,7 +1,7 @@ The common CFI driver provides this weak default implementation for flash_cmd_reset(): -void __flash_cmd_reset(flash_info_t *info) +static void __flash_cmd_reset(flash_info_t *info) { /* * We do not yet know what kind of commandset to use, so we issue @@ -9,22 +9,43 @@ void __flash_cmd_reset(flash_info_t *info) * that AMD flash roms ignore the Intel command. */ flash_write_cmd(info, 0, 0, AMD_CMD_RESET); + udelay(1); flash_write_cmd(info, 0, 0, FLASH_CMD_RESET); } void flash_cmd_reset(flash_info_t *info) __attribute__((weak,alias("__flash_cmd_reset"))); +Some flash chips seem to have trouble with this reset sequence. +In this case, board-specific code can override this weak default +version with a board-specific function. -Some flash chips seems to have trouble with this reset sequence. In this case -the board specific code can override this weak default version with a board -specific function. For example the digsy_mtc board equipped with the M29W128GH -from Numonyx needs this version to function properly: +At the time of writing, there are two boards that define their own +routine for this. + +First, the digsy_mtc board equipped with the M29W128GH from Numonyx +needs this version to function properly: void flash_cmd_reset(flash_info_t *info) { flash_write_cmd(info, 0, 0, AMD_CMD_RESET); } +In addition, the t3corp board defines the routine thusly: + +void flash_cmd_reset(flash_info_t *info) +{ + /* + * FLASH at address CONFIG_SYS_FLASH_BASE is a Spansion chip and + * needs the Spansion type reset commands. The other flash chip + * is located behind a FPGA (Xilinx DS617) and needs the Intel type + * reset command. + */ + if (info->start[0] == CONFIG_SYS_FLASH_BASE) + flash_write_cmd(info, 0, 0, AMD_CMD_RESET); + else + flash_write_cmd(info, 0, 0, FLASH_CMD_RESET); +} + see also: http://www.mail-archive.com/u-boot@lists.denx.de/msg24368.html -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

2 1

[U-Boot] [PATCH] digsy_mtc.c: Minor spelling/grammar fixes.
by Robert P. J. Day 03 Jan '17

03 Jan '17

Signed-off-by: Robert P. J. Day <rpjday(a)crashcourse.ca> --- diff --git a/board/intercontrol/digsy_mtc/digsy_mtc.c b/board/intercontrol/digsy_mtc/digsy_mtc.c index 37eb6c7..05d673d 100644 --- a/board/intercontrol/digsy_mtc/digsy_mtc.c +++ b/board/intercontrol/digsy_mtc/digsy_mtc.c @@ -41,7 +41,7 @@ extern int usb_cpu_init(void); #if defined(CONFIG_DIGSY_REV5) /* - * The M29W128GH needs a specail reset command function, + * The M29W128GH needs a special reset command function, * details see the doc/README.cfi file */ void flash_cmd_reset(flash_info_t *info) @@ -76,7 +76,7 @@ static void sdram_start(int hi_addr) /* * ATTENTION: Although partially referenced initdram does NOT make real use * use of CONFIG_SYS_SDRAM_BASE. The code does not work if - * CONFIG_SYS_SDRAM_BASE is something else than 0x00000000. + * CONFIG_SYS_SDRAM_BASE is something other than 0x00000000. */ phys_size_t initdram(int board_type) -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

2 1

[U-Boot] [PATCH v4 0/4] cl-som-am57x: initial support
by Uri Mashiach 03 Jan '17

03 Jan '17

This patch series adds support for CompuLab CL-SOM-AM57X board and the SBC-AM57X evaluation kit. CL-SOM-AM57x is a miniature System-on-Module (SoM) based on TI Sitara AM57x ARM Cortex-A15 System-on-Chip family. SBC-AM57x is a single board computer, implemented with the CL-SOM-AM57x computer-on-module and the SB-SOM-AM57x carrier board. The CL-SOM-AM57x providing most of the functions and the SB-SOM-AM57x providing additional peripheral functions and connectors. The SBC-AM57x has the following features: CPU: Texas Instruments Sitara AM5728 dual-core ARM Cortex-A15, 1.5GHz or Texas Instruments Sitara AM5718 single-core ARM Cortex-A15, 1.5GHz RAM: DDR3, 512MB – 4GB Storage: NAND flash, 512MB - 1GB or eMMC flash, 4GB - 32GB SPI-flash 2MB Ethernet: Up to 2x 10/100/1000Mbps Ethernet ports (MAC+PHY) WiFi/BT: 802.11b/g/n WiFi interface (TI WiLink 8 WL1801 chipset) or Dual-band 2x2 802.11a/b/g/n WiFi interface (TI WiLink 8 WL1837 chipset) Analog Audio: Audio codec with stereo output, stereo input and microphone support More details can be found here: https://www.compulab.co.il/products/computer-on-modules/cl-som-am57x-ti-am5… https://www.compulab.co.il/products/sbcs/sbc-am57x-ti-am5728-am5718-single-… --- v3 -> v4: Adjusted to v2017.01-rc2 Dmitry Lifshitz (3): arm: am57xx: cl-som-am57x: add initial board support arm: am57xx: cl-som-am57x: fetch board rev from EEPROM arm: am57xx: cl-som-am57x: add ETH support Uri Mashiach (1): arm: am57xx: cl-som-am57x: update default env arch/arm/mach-omap2/omap5/Kconfig | 4 + board/compulab/cl-som-am57x/Kconfig | 12 ++ board/compulab/cl-som-am57x/MAINTAINERS | 6 + board/compulab/cl-som-am57x/Makefile | 17 +++ board/compulab/cl-som-am57x/cl-som-am57x.c | 76 ++++++++++ board/compulab/cl-som-am57x/eth.c | 198 ++++++++++++++++++++++++ board/compulab/cl-som-am57x/mux.c | 123 +++++++++++++++ board/compulab/cl-som-am57x/spl.c | 234 +++++++++++++++++++++++++++++ configs/cl-som-am57x_defconfig | 41 +++++ include/configs/cl-som-am57x.h | 197 ++++++++++++++++++++++++ 10 files changed, 908 insertions(+) create mode 100644 board/compulab/cl-som-am57x/Kconfig create mode 100644 board/compulab/cl-som-am57x/MAINTAINERS create mode 100644 board/compulab/cl-som-am57x/Makefile create mode 100644 board/compulab/cl-som-am57x/cl-som-am57x.c create mode 100644 board/compulab/cl-som-am57x/eth.c create mode 100644 board/compulab/cl-som-am57x/mux.c create mode 100644 board/compulab/cl-som-am57x/spl.c create mode 100644 configs/cl-som-am57x_defconfig create mode 100644 include/configs/cl-som-am57x.h -- 2.7.4

2 8

[U-Boot] [PATCH] tools: binman: Use /usr/bin/env to find python executable
by Emmanuel Vadot 03 Jan '17

03 Jan '17

Some OS (all BSD and probably others) do not have python in /usr/bin but in another directory. It is a common usage to use /usr/bin/env python as shebang for python scripts so use this for binman. Signed-off-by: Emmanuel Vadot <manu(a)bidouilliste.com> --- tools/binman/binman.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/binman/binman.py b/tools/binman/binman.py index 7fb67cb25f..4cc431fbbe 100755 --- a/tools/binman/binman.py +++ b/tools/binman/binman.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # Copyright (c) 2016 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> -- 2.11.0

2 1

[U-Boot] [PULL] Please pull u-boot-imx
by Stefano Babic 03 Jan '17

03 Jan '17

Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit 3d3a74cc8c774345be7d1661b215555ad41f4515: mmc: move MMC_SDHCI_IO_ACCESSORS to Kconfig (2016-12-29 13:08:17 -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 7c4f0ff81e6fc3b58b8af5f64c3da98624e40132: udoo: neo: Fix indentation (2017-01-02 17:55:58 +0100) ---------------------------------------------------------------- Fabio Estevam (4): udoo_neo: Remove USDHC3 entry udoo_neo: Use 'fdtfile' variable name mx6qsabreauto: Fix the EIM clock for the mx6qp variant udoo: neo: Fix indentation Jagan Teki (12): imx6: engicam: Use bootm instead of bootz configs: engicam: Rename nand with gpmi-name in mtdparts defconfigs: engicam: Enable MMC commands in nand defconfigs: engicam: Enable UBI commands imx6: engicam: Add nandboot env support defconfigs: imx6: engicam: Enable FIT configs: engicam: Enable CONFIG_IMAGE_FORMAT_LEGACY configs: engicam: Cleanup on mmcboot env configs: engicam: Add fitboot env support imx6ul: geam6ul: Add MAINTAINERS for nand_defconfig imx6ul: geam6ul: Enable I2C support Kevin Hilman (1): ARM: imx7s-warp: enable USB gadget ethernet Peng Fan (1): imx: thermal: Kconfig: add MX7 Sven Ebenfeld (5): arm: imx: remove bmode , hdmidet and dek commands from SPL arm: imx: add HAB authentication of image to SPL boot tools: mkimage: add firmware-ivt image type for HAB verification doc: imx6: add section for secure boot with SPL Makefile: preserve output for images that can contain HAB Blocks .gitignore | 2 +- Makefile | 15 +++++++++++++-- arch/arm/Makefile | 2 +- arch/arm/imx-common/Makefile | 6 ++++++ arch/arm/imx-common/hab.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------- arch/arm/imx-common/spl.c | 25 +++++++++++++++++++++++++ arch/arm/imx-common/spl_sd.cfg | 10 ++++++++++ arch/arm/include/asm/imx-common/hab.h | 2 ++ board/engicam/geam6ul/MAINTAINERS | 1 + board/freescale/mx6qsabreauto/mx6qsabreauto.c | 28 ++++++++++++++++++++++++++++ board/udoo/neo/neo.c | 7 +++---- board/warp7/warp7.c | 14 ++++++++++++++ common/image.c | 6 ++++++ configs/imx6dl_icore_mmc_defconfig | 4 +++- configs/imx6dl_icore_nand_defconfig | 10 +++++++++- configs/imx6dl_icore_rqs_mmc_defconfig | 4 +++- configs/imx6q_icore_mmc_defconfig | 4 +++- configs/imx6q_icore_nand_defconfig | 10 +++++++++- configs/imx6q_icore_rqs_mmc_defconfig | 4 +++- configs/imx6ul_geam_mmc_defconfig | 4 +++- configs/imx6ul_geam_nand_defconfig | 12 +++++++++++- configs/warp7_defconfig | 5 +++++ doc/README.imx6 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ drivers/thermal/Kconfig | 2 +- include/configs/imx6qdl_icore.h | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------- include/configs/imx6qdl_icore_rqs.h | 43 ++++++++++++++++++++++++++++++------------- include/configs/imx6ul_geam.h | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------- include/configs/mx6_common.h | 3 +++ include/configs/udoo_neo.h | 12 ++++++------ include/configs/warp7.h | 7 +++++++ include/image.h | 1 + scripts/Makefile.lib | 3 ++- scripts/Makefile.spl | 4 +++- tools/default_image.c | 10 ++++++++-- tools/mkimage.c | 32 ++++++++++++++++++++++++++++++++ 35 files changed, 486 insertions(+), 137 deletions(-) Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk 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 1

[U-Boot] [PATCH] mtd: nand: mxs_nand_spl: Fix to remove twise 'NAND' print
by Jagan Teki 02 Jan '17

02 Jan '17

SPL from nand will print 'NAND' in boot_from_devices based on the image_loader name, remove the extra 'NAND ' in mxs_nand_spl driver. After the fix: ------------- U-Boot SPL 2017.01-rc2-gf84dd8b (Jan 02 2017 - 22:24:19) Trying to boot from NANDNAND : 512 MiB Original behaviour: ------------------- U-Boot SPL 2017.01-rc2-gf84dd8b-dirty (Jan 02 2017 - 23:17:00) Trying to boot from NAND: 512 MiB Cc: Tom Rini <trini(a)konsulko.com> Signed-off-by: Jagan Teki <jagan(a)openedev.com> --- drivers/mtd/nand/mxs_nand_spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/mxs_nand_spl.c b/drivers/mtd/nand/mxs_nand_spl.c index ff28df4..b6c9208 100644 --- a/drivers/mtd/nand/mxs_nand_spl.c +++ b/drivers/mtd/nand/mxs_nand_spl.c @@ -153,7 +153,7 @@ static int mxs_nand_init(void) nand_chip.numchips = 1; /* identify flash device */ - puts("NAND : "); + puts(": "); if (mxs_flash_ident(mtd)) { printf("Failed to identify\n"); return -1; -- 1.9.1

1 0