December 2015 - U-Boot

[U-Boot] [PATCH 0/2] sunxi: support for a second SD card socket
by Karsten Merker 12 Dec '15

12 Dec '15

Hello, this patchset enables the full-size SD card socket on the A20-Olimex-SOM-EVB baseboard in u-boot and adds support for including this kind of secondary socket into the boot process provided by config_distro_bootcmd.h. The latter is particularly useful on the A20-Olimex-SOM-EVB as changing the card in the primary micro-SD socket is kind of fiddly when the SOM is plugged into the baseboard. Regards, Karsten Karsten Merker (2): sunxi: A20-Olimex-SOM-EVB defconfig: enable mmc3 sunxi: Enable a second mmc socket as boot target in the environment configs/A20-Olimex-SOM-EVB_defconfig | 3 +++ include/configs/sunxi-common.h | 6 ++++++ 2 files changed, 9 insertions(+) -- 2.1.4

1 2

[U-Boot] [PATCH v2] ARM: mxs: allow boards to select DC-DC switching clock source
by Michael Heimpold 12 Dec '15

12 Dec '15

For some board designs, it might be useful to switch the DC-DC clock source to something else rather the default 24 MHz, e.g. for EMI reasons. For this, override the mxs_power_setup_dcdc_clocksource function in your board support files. Example: void mxs_power_setup_dcdc_clocksource(void) { mxs_power_select_dcdc_clocksource(POWER_MISC_FREQSEL_20MHZ); } Signed-off-by: Michael Heimpold <mhei(a)heimpold.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Otavio Salvador <otavio(a)ossystems.com.br> Cc: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes in v2: - use a weak function approach instead of ifdef'ery as suggested by Marek Vasut arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 31 +++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mxs/sys_proto.h | 2 ++ 2 files changed, 33 insertions(+) diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c index 1972de8..64e215c 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c @@ -248,6 +248,36 @@ static void mxs_power_setup_5v_detect(void) } /** + * mxs_power_switch_dcdc_clocksource() - Switch PLL clock for DC-DC converters + * + * This function configures and then enables an alternative PLL clock source + * for the DC-DC converters. + */ +void mxs_power_select_dcdc_clocksource(uint32_t freqsel) +{ + struct mxs_power_regs *power_regs = + (struct mxs_power_regs *)MXS_POWER_BASE; + + /* Select clocksource for DC-DC converters */ + clrsetbits_le32(&power_regs->hw_power_misc, + POWER_MISC_FREQSEL_MASK, + freqsel); + setbits_le32(&power_regs->hw_power_misc, + POWER_MISC_SEL_PLLCLK); +} + +/** + * mxs_power_setup_dcdc_clocksource() + * + * Normally, there is no need to switch DC-DC clocksource. However, boards + * can implement this function when required. + */ +__weak void mxs_power_setup_dcdc_clocksource(void) +{ + debug("SPL: Using default DC-DC clocksource\n"); +} + +/** * mxs_src_power_init() - Preconfigure the power block * * This function configures reasonable values for the DC-DC control loop @@ -872,6 +902,7 @@ static void mxs_power_configure_power_source(void) debug("SPL: Configuring power source\n"); + mxs_power_setup_dcdc_clocksource(); mxs_src_power_init(); if (readl(&power_regs->hw_power_sts) & POWER_STS_VDD5V_GT_VDDIO) { diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h index 20ff101..4160e43 100644 --- a/arch/arm/include/asm/arch-mxs/sys_proto.h +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h @@ -25,6 +25,8 @@ int mxsmmc_initialize(bd_t *bis, int id, int (*wp)(int), int (*cd)(int)); void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr, const iomux_cfg_t *iomux_setup, const unsigned int iomux_size); + +void mxs_power_select_dcdc_clocksource(uint32_t freqsel); #endif struct mxs_pair { -- 2.5.0

2 3

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

12 Dec '15

Hi Tom, Please pull this PR. thanks! Jagan. The following changes since commit 789fa275b3750e60c60cb3d18eabc9467892c257: x86: Remove HAVE_ACPI_RESUME (2015-12-09 17:44:56 +0800) are available in the git repository at: git://git.denx.de/u-boot-spi.git master for you to fetch changes up to 76de51a6da0411e1f3e80e1c9a2ef5bfa8e35571: spi: xilinx: Add new compatible strings (2015-12-11 22:12:24 +0530) ---------------------------------------------------------------- Jagan Teki (17): spi: Get spi-3wire from dts spi: ti_qspi: Fix SPI_3WIRE checking using mode sf: spi_flash_validate_params => spi_flash_scan sf: Move spi_flash_scan code to sf_ops sf: Move read_id code to sf_ops sf: probe: Code cleanup sf: Use static for file-scope functions sf: Fix Makefile sf: Use simple name for register access functions sf: Flash power up read-only based on idcode0 sf: Remove unneeded header includes sf: Remove unneeded SST_BP and SST_WP sf: ops: Fix missing break on spansion read_bar sf: sf_probe: Remove spi_slave pointer argument sf: Use static for file-scope functions sf: Rename sf_ops.c to spi-flash.c mailmap: Update Jagan Teki's name and email address Michal Simek (3): spi: zynq_spi: Add cadence compatible string spi: Kconfig: Fix correct target name for ZynqMP spi: xilinx: Add new compatible strings Peng Fan (1): imx: mx7dsabresd: Add QSPI support .mailmap | 6 +- board/freescale/mx7dsabresd/mx7dsabresd.c | 30 +++ drivers/mtd/spi/Makefile | 6 +- drivers/mtd/spi/sf_internal.h | 38 ++- drivers/mtd/spi/sf_probe.c | 373 +-------------------------- drivers/mtd/spi/{sf_ops.c => spi_flash.c} | 406 ++++++++++++++++++++++++++++-- drivers/spi/Kconfig | 2 +- drivers/spi/spi-uclass.c | 2 + drivers/spi/ti_qspi.c | 2 +- drivers/spi/xilinx_spi.c | 3 +- drivers/spi/zynq_spi.c | 1 + include/configs/mx7dsabresd.h | 15 ++ 12 files changed, 465 insertions(+), 419 deletions(-) rename drivers/mtd/spi/{sf_ops.c => spi_flash.c} (60%)

2 1

[U-Boot] Please pull u-boot-dm
by Simon Glass 12 Dec '15

12 Dec '15

Hi Tom, A few small things in my queue... The following changes since commit 8555dd88cd1a7b5dd1e76c111fe635a92223b98b: axs10x: add support of generic EHCI USB 2.0 controller (2015-12-08 17:29:56 +0300) are available in the git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to eb623b98c9d28691cbce5adfd02163ad102dcbed: dm: serial: Minor coding style cleanup of some comments (2015-12-10 20:42:03 -0700) ---------------------------------------------------------------- Stefan Roese (2): dm: core: Fix Kconfig text to mention SPL in SPL_OF_TRANSLATE dm: serial: Minor coding style cleanup of some comments Thomas Chou (1): buildman: README: add links for toolchains not available on kernel.org drivers/core/Kconfig | 2 +- drivers/serial/serial-uclass.c | 20 ++++++++++---------- tools/buildman/README | 23 ++++++++++++++++++++++- 3 files changed, 33 insertions(+), 12 deletions(-) Regards, Simon

2 1

[U-Boot] Please pull u-boot-sunxi master
by Hans de Goede 12 Dec '15

12 Dec '15

Hi Tom, Here is another sunxi pull-req for v2016.01, highlights: -Add support for A83 SoC -Misc. small bugfixes The following changes since commit 789fa275b3750e60c60cb3d18eabc9467892c257: x86: Remove HAVE_ACPI_RESUME (2015-12-09 17:44:56 +0800) are available in the git repository at: http://git.denx.de/u-boot-sunxi.git master for you to fetch changes up to bb3654629a6b2ab131de96489f70421f6a848c70: sunxi: Fix H3 DRAM DQ read delay configuration (2015-12-10 15:45:48 +0100) ---------------------------------------------------------------- Hans de Goede (2): sunxi: Set AHB1 clock to PLL6/3 on all clock_sun6i.h using SoCs sunxi: select SYS_NS16550 from Kconfig Jens Kuske (1): sunxi: Fix H3 DRAM DQ read delay configuration Olliver Schinagl (2): sunxi: twi: Enable clocks on sun7i sun4i: clock: Cleanup some whitespace errors vishnupatekar (8): sunxi: Add Machine Support for A83T SOC sunxi: Add support for UART0 in PB pin group on A83T sunxi: power: axp818: add support for axp818 driver sunxi: power: enabled support for axp818 sunxi: clk: add basic clocks for A83T sunxi: Add support for Allwinner A83T DRAM sunxi: dts: sun8i: Add Allwinner A83T dtsi sunxi: Add suport for A83T HomletV2 Board by Allwinner arch/arm/Kconfig | 1 + arch/arm/cpu/armv7/sunxi/Makefile | 6 + arch/arm/cpu/armv7/sunxi/board.c | 4 + arch/arm/cpu/armv7/sunxi/clock_sun4i.c | 9 +- arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 3 - arch/arm/cpu/armv7/sunxi/clock_sun8i_a83t.c | 136 +++++++ arch/arm/cpu/armv7/sunxi/cpu_info.c | 2 + arch/arm/cpu/armv7/sunxi/dram_sun8i_a83t.c | 424 +++++++++++++++++++++ arch/arm/cpu/armv7/sunxi/dram_sun8i_h3.c | 12 +- arch/arm/cpu/armv7/sunxi/pmic_bus.c | 7 +- arch/arm/dts/Makefile | 2 + arch/arm/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 64 ++++ arch/arm/dts/sun8i-a83t.dtsi | 247 ++++++++++++ arch/arm/include/asm/arch-sunxi/clock.h | 4 +- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 4 - arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h | 304 +++++++++++++++ arch/arm/include/asm/arch-sunxi/dram.h | 2 + arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h | 201 ++++++++++ arch/arm/include/asm/arch-sunxi/gpio.h | 1 + board/sunxi/Kconfig | 9 +- board/sunxi/MAINTAINERS | 5 + board/sunxi/board.c | 13 +- configs/A10-OLinuXino-Lime_defconfig | 1 - configs/A10s-OLinuXino-M_defconfig | 1 - configs/A13-OLinuXinoM_defconfig | 1 - configs/A13-OLinuXino_defconfig | 1 - configs/A20-OLinuXino-Lime2_defconfig | 1 - configs/A20-OLinuXino-Lime_defconfig | 1 - configs/A20-OLinuXino_MICRO_defconfig | 1 - configs/A20-Olimex-SOM-EVB_defconfig | 1 - configs/Ainol_AW1_defconfig | 1 - configs/Ampe_A76_defconfig | 1 - configs/Auxtek-T003_defconfig | 1 - configs/Auxtek-T004_defconfig | 1 - configs/Bananapi_defconfig | 1 - configs/Bananapro_defconfig | 1 - configs/CHIP_defconfig | 1 - configs/CSQ_CS908_defconfig | 1 - configs/Chuwi_V7_CW0825_defconfig | 1 - configs/Colombus_defconfig | 1 - configs/Cubieboard2_defconfig | 1 - configs/Cubieboard_defconfig | 1 - configs/Cubietruck_defconfig | 1 - configs/Hummingbird_A31_defconfig | 1 - configs/Hyundai_A7HD_defconfig | 1 - configs/Lamobo_R1_defconfig | 1 - configs/Linksprite_pcDuino3_Nano_defconfig | 1 - configs/Linksprite_pcDuino3_defconfig | 1 - configs/Linksprite_pcDuino_defconfig | 1 - configs/MK808C_defconfig | 1 - configs/MSI_Primo73_defconfig | 1 - configs/MSI_Primo81_defconfig | 1 - configs/Marsboard_A10_defconfig | 1 - configs/Mele_A1000G_quad_defconfig | 1 - configs/Mele_A1000_defconfig | 1 - configs/Mele_I7_defconfig | 1 - configs/Mele_M3_defconfig | 1 - configs/Mele_M5_defconfig | 1 - configs/Mele_M9_defconfig | 1 - configs/Merrii_A80_Optimus_defconfig | 1 - configs/Mini-X_defconfig | 1 - configs/Orangepi_defconfig | 1 - configs/Orangepi_mini_defconfig | 1 - configs/Sinlinx_SinA33_defconfig | 1 - configs/Sinovoip_BPI_M2_defconfig | 1 - configs/UTOO_P66_defconfig | 1 - configs/Wexler_TAB7200_defconfig | 1 - configs/Wits_Pro_A20_DKT_defconfig | 1 - configs/Wobo_i5_defconfig | 1 - configs/Yones_Toptech_BD1078_defconfig | 1 - configs/ba10_tv_box_defconfig | 1 - configs/ga10h_v1_1_defconfig | 1 - configs/gt90h_v4_defconfig | 1 - configs/h8_homlet_v2_defconfig | 24 ++ configs/i12-tvbox_defconfig | 1 - configs/iNet_3F_defconfig | 1 - configs/iNet_3W_defconfig | 1 - configs/iNet_86VS_defconfig | 1 - configs/inet1_defconfig | 1 - configs/inet97fv2_defconfig | 1 - configs/inet98v_rev2_defconfig | 1 - configs/inet9f_rev03_defconfig | 1 - configs/jesurun_q5_defconfig | 1 - configs/mixtile_loftq_defconfig | 1 - configs/mk802_a10s_defconfig | 1 - configs/mk802_defconfig | 1 - configs/mk802ii_defconfig | 1 - configs/orangepi_pc_defconfig | 1 - configs/orangepi_plus_defconfig | 1 - configs/pov_protab2_ips9_defconfig | 1 - configs/q8_a13_tablet_defconfig | 1 - configs/q8_a23_tablet_800x480_defconfig | 1 - configs/q8_a33_tablet_1024x600_defconfig | 1 - configs/q8_a33_tablet_800x480_defconfig | 1 - configs/r7-tv-dongle_defconfig | 1 - configs/sunxi_Gemei_G9_defconfig | 1 - drivers/power/Kconfig | 40 +- drivers/power/Makefile | 1 + drivers/power/axp818.c | 132 +++++++ include/axp818.h | 75 ++++ include/axp_pmic.h | 3 + include/configs/sun8i.h | 4 + include/configs/sunxi-common.h | 3 +- 103 files changed, 1701 insertions(+), 114 deletions(-) create mode 100644 arch/arm/cpu/armv7/sunxi/clock_sun8i_a83t.c create mode 100644 arch/arm/cpu/armv7/sunxi/dram_sun8i_a83t.c create mode 100644 arch/arm/dts/sun8i-a83t-allwinner-h8homlet-v2.dts create mode 100644 arch/arm/dts/sun8i-a83t.dtsi create mode 100644 arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h create mode 100644 configs/h8_homlet_v2_defconfig create mode 100644 drivers/power/axp818.c create mode 100644 include/axp818.h Regards, Hans

2 1

[U-Boot] [PATCH v2] imx_common: check for Serial Downloader in spl_boot_device
by Stefano Babic 11 Dec '15

11 Dec '15

Check for bmode before reading the boot device to check if a serial downloader is started, and returns UART if the serial downloader is set, letting SPL to wait for an image if CONFIG_SPL_YMODEM_SUPPORT is set. This allows to load again a SPL based board with imx_usb_loader together with a tool such as kermit. Signed-off-by: Stefano Babic <sbabic(a)denx.de> CC: Tim Harvey <tharvey(a)gateworks.com> CC: Fabio Estevam <Fabio.Estevam(a)freescale.com> CC: Eric Nelson <eric.nelson(a)boundarydevices.com> --- Changes in v2: - Add documentation (S. Roese) - Check just bits 24-25 because reserved bits are set on some variants (E. Nelson) - Set boot device to UARt if USB is set to let bmode working as suggested by Eric arch/arm/imx-common/spl.c | 8 ++++++++ doc/README.imx6 | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c index ac6e40e..a8f2492 100644 --- a/arch/arm/imx-common/spl.c +++ b/arch/arm/imx-common/spl.c @@ -20,7 +20,15 @@ u32 spl_boot_device(void) struct src *psrc = (struct src *)SRC_BASE_ADDR; unsigned int gpr10_boot = readl(&psrc->gpr10) & (1 << 28); unsigned reg = gpr10_boot ? readl(&psrc->gpr9) : readl(&psrc->sbmr1); + unsigned int bmode = readl(&psrc->sbmr2); + /* + * Check for BMODE if serial downloader is enabled + * BOOT_MODE - see IMX6DQRM Table 8-1 + */ + if ((((bmode >> 24) & 0x03) == 0x01) || /* Serial Downloader */ + (gpr10_boot && (1 == reg))) + return BOOT_DEVICE_UART; /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg & 0x000000FF) >> 4) { /* EIM: See 8.5.1, Table 8-9 */ diff --git a/doc/README.imx6 b/doc/README.imx6 index 437af2f..5aa41f2 100644 --- a/doc/README.imx6 +++ b/doc/README.imx6 @@ -84,3 +84,54 @@ Address: Reading bank 4: Word 0x00000002: 9f027772 00000004 + +2. Using imx_usb_loader for first install with SPL +-------------------------------------------------- + +imx_usb_loader is a very nice tool by BoundaryDevice that +allow to install U-Boot without a JTAG debugger, using +the USB boot mode as described in the manual. It is +a replacement for Freescale's MFGTOOLS. + +The sources can be found here: + + https://github.com/boundarydevices/imx_usb_loader.git + +Booting in USB mode, the i.MX6 announces itself to the Linux Host as: + +Bus 001 Device 111: ID 15a2:0061 Freescale Semiconductor, Inc. + +imx_usb_loader is able to download a single file (u-boot.imx) +to the board. For boards without SPL support, it is enough to +issue the command: + + sudo ../imx_usb_loader/imx_usb -v u-boot.imx + +Getting U-Boot when SPL support is active, it requires to use +two communications. imx_usb_loader downloads the SPL into +OCRAM and starts it. SPL will check for a valid u-boot.img, and +because it is not found, it will wait for it using the y-modem +protocol via the console. + +A first install is then possible combining imx_usb_loader with +another tool such as kermit. + +sudo ../imx_usb_loader/imx_usb -v SPL +kermit kermit_uboot + +and kermit_uboot contains something like this (set line should be adjusted): + +set line /dev/ttyUSB1 +set speed 115200 +SET CARRIER-WATCH OFF +set flow-control none +set handshake none +set prefixing all +set file type bin +set protocol ymodem +send u-boot.img +c + +The last "c" command tells kermit (from ckermit package in most distros) +to switch from command line mode to communication mode, and when the +script is finished, the U-Boot prompt is shown in the same shell. -- 1.9.1

3 5

[U-Boot] [PATCH v10 01/14] sf: spi_flash_validate_params => spi_flash_scan
by Jagan Teki 11 Dec '15

11 Dec '15

Rename spi_flash_validate_params to spi_flash_scan as this code not only deals with params setup but also configure all spi_flash attributes. And also moved all flash related code into spi_flash_scan for future functionality addition. Tested-by: Jagan Teki <jteki(a)openedev.com> Tested-by: Bin Meng <bmeng.cn(a)gmail.com> Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Jagan Teki <jteki(a)openedev.com> --- Changes on v10: - Fixed ALIGN warning drivers/mtd/spi/sf_probe.c | 147 +++++++++++++++++++++++---------------------- 1 file changed, 76 insertions(+), 71 deletions(-) diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index a619182..3da72df 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -130,13 +130,42 @@ bank_end: } #endif -static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode, - struct spi_flash *flash) +#if CONFIG_IS_ENABLED(OF_CONTROL) +int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash) +{ + fdt_addr_t addr; + fdt_size_t size; + int node; + + /* If there is no node, do nothing */ + node = fdtdec_next_compatible(blob, 0, COMPAT_GENERIC_SPI_FLASH); + if (node < 0) + return 0; + + addr = fdtdec_get_addr_size(blob, node, "memory-map", &size); + if (addr == FDT_ADDR_T_NONE) { + debug("%s: Cannot decode address\n", __func__); + return 0; + } + + if (flash->size != size) { + debug("%s: Memory map must cover entire device\n", __func__); + return -1; + } + flash->memory_map = map_sysmem(addr, size); + + return 0; +} +#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */ + +static int spi_flash_scan(struct spi_slave *spi, u8 *idcode, + struct spi_flash *flash) { const struct spi_flash_params *params; u8 cmd; u16 jedec = idcode[1] << 8 | idcode[2]; u16 ext_jedec = idcode[3] << 8 | idcode[4]; + int ret; /* Validate params from spi_flash_params table */ params = spi_flash_params_table; @@ -158,6 +187,13 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode, return -EPROTONOSUPPORT; } + /* Flash powers up read-only, so clear BP# bits */ +#if defined(CONFIG_SPI_FLASH_ATMEL) || \ + defined(CONFIG_SPI_FLASH_MACRONIX) || \ + defined(CONFIG_SPI_FLASH_SST) + spi_flash_cmd_write_status(flash, 0); +#endif + /* Assign spi data */ flash->spi = spi; flash->name = params->name; @@ -253,6 +289,17 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode, /* Go for default supported write cmd */ flash->write_cmd = CMD_PAGE_PROGRAM; + /* Set the quad enable bit - only for quad commands */ + if ((flash->read_cmd == CMD_READ_QUAD_OUTPUT_FAST) || + (flash->read_cmd == CMD_READ_QUAD_IO_FAST) || + (flash->write_cmd == CMD_QUAD_PAGE_PROGRAM)) { + ret = spi_flash_set_qeb(flash, idcode[0]); + if (ret) { + debug("SF: Fail to set QEB for %02x\n", idcode[0]); + return -EINVAL; + } + } + /* Read dummy_byte: dummy byte is determined based on the * dummy cycles of a particular command. * Fast commands - dummy_byte = dummy_cycles/8 @@ -279,48 +326,41 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode, /* Configure the BAR - discover bank cmds and read current bank */ #ifdef CONFIG_SPI_FLASH_BAR - int ret = spi_flash_read_bank(flash, idcode[0]); + ret = spi_flash_read_bank(flash, idcode[0]); if (ret < 0) return ret; #endif - /* Flash powers up read-only, so clear BP# bits */ -#if defined(CONFIG_SPI_FLASH_ATMEL) || \ - defined(CONFIG_SPI_FLASH_MACRONIX) || \ - defined(CONFIG_SPI_FLASH_SST) - spi_flash_cmd_write_status(flash, 0); -#endif - - return 0; -} - #if CONFIG_IS_ENABLED(OF_CONTROL) -int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash) -{ - fdt_addr_t addr; - fdt_size_t size; - int node; - - /* If there is no node, do nothing */ - node = fdtdec_next_compatible(blob, 0, COMPAT_GENERIC_SPI_FLASH); - if (node < 0) - return 0; - - addr = fdtdec_get_addr_size(blob, node, "memory-map", &size); - if (addr == FDT_ADDR_T_NONE) { - debug("%s: Cannot decode address\n", __func__); - return 0; + ret = spi_flash_decode_fdt(gd->fdt_blob, flash); + if (ret) { + debug("SF: FDT decode error\n"); + return -EINVAL; } +#endif - if (flash->size != size) { - debug("%s: Memory map must cover entire device\n", __func__); - return -1; +#ifndef CONFIG_SPL_BUILD + printf("SF: Detected %s with page size ", flash->name); + print_size(flash->page_size, ", erase size "); + print_size(flash->erase_size, ", total "); + print_size(flash->size, ""); + if (flash->memory_map) + printf(", mapped at %p", flash->memory_map); + puts("\n"); +#endif + +#ifndef CONFIG_SPI_FLASH_BAR + if (((flash->dual_flash == SF_SINGLE_FLASH) && + (flash->size > SPI_FLASH_16MB_BOUN)) || + ((flash->dual_flash > SF_SINGLE_FLASH) && + (flash->size > SPI_FLASH_16MB_BOUN << 1))) { + puts("SF: Warning - Only lower 16MiB accessible,"); + puts(" Full access #define CONFIG_SPI_FLASH_BAR\n"); } - flash->memory_map = map_sysmem(addr, size); +#endif - return 0; + return ret; } -#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */ /** * spi_flash_probe_slave() - Probe for a SPI flash device on a bus @@ -359,47 +399,12 @@ int spi_flash_probe_slave(struct spi_slave *spi, struct spi_flash *flash) print_buffer(0, idcode, 1, sizeof(idcode), 0); #endif - if (spi_flash_validate_params(spi, idcode, flash)) { + ret = spi_flash_scan(spi, idcode, flash); + if (ret) { ret = -EINVAL; goto err_read_id; } - /* Set the quad enable bit - only for quad commands */ - if ((flash->read_cmd == CMD_READ_QUAD_OUTPUT_FAST) || - (flash->read_cmd == CMD_READ_QUAD_IO_FAST) || - (flash->write_cmd == CMD_QUAD_PAGE_PROGRAM)) { - if (spi_flash_set_qeb(flash, idcode[0])) { - debug("SF: Fail to set QEB for %02x\n", idcode[0]); - ret = -EINVAL; - goto err_read_id; - } - } - -#if CONFIG_IS_ENABLED(OF_CONTROL) - if (spi_flash_decode_fdt(gd->fdt_blob, flash)) { - debug("SF: FDT decode error\n"); - ret = -EINVAL; - goto err_read_id; - } -#endif -#ifndef CONFIG_SPL_BUILD - printf("SF: Detected %s with page size ", flash->name); - print_size(flash->page_size, ", erase size "); - print_size(flash->erase_size, ", total "); - print_size(flash->size, ""); - if (flash->memory_map) - printf(", mapped at %p", flash->memory_map); - puts("\n"); -#endif -#ifndef CONFIG_SPI_FLASH_BAR - if (((flash->dual_flash == SF_SINGLE_FLASH) && - (flash->size > SPI_FLASH_16MB_BOUN)) || - ((flash->dual_flash > SF_SINGLE_FLASH) && - (flash->size > SPI_FLASH_16MB_BOUN << 1))) { - puts("SF: Warning - Only lower 16MiB accessible,"); - puts(" Full access #define CONFIG_SPI_FLASH_BAR\n"); - } -#endif #ifdef CONFIG_SPI_FLASH_MTD ret = spi_flash_mtd_register(flash); #endif -- 1.9.1

1 3

[U-Boot] [PATCH v8 00/14] sf: Tuning spi-flash layer
by Jagan Teki 11 Dec '15

11 Dec '15

This series bypasses MTD changes from previous series[1][2] and entire series tunned spi-flash layer for better code handling. Changes in v8: - Rebase to master - PATCH v8 12/14, 13/14, 14/14 added newly. Changes in v7: - Rebase to master - Few patch bisectable separations Changes in v6, v5, v4, v3, v2: - One patch bisectable separation - Rebase to master Testing: $ git clone git://git.denx.de/u-boot-spi.git $ cd u-boot-spi $ git checkout -b next origin/next [1] http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/242397 [2] http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/233262 thanks! Jagan. Jagan Teki (14): sf: spi_flash_validate_params => spi_flash_scan sf: Move spi_flash_scan code to sf_ops sf: Move read_id code to sf_ops sf: probe: Code cleanup sf: Use static for file-scope functions sf: Fix Makefile sf: Use simple name for register access functions sf: Flash power up read-only based on idcode0 sf: Remove unneeded header includes sf: Remove unneeded SST_BP and SST_WP sf: ops: Fix missing break on spansion read_bar sf: sf_probe: Remove spi_slave pointer argument sf: Use static for file-scope functions sf: Rename sf_ops.c to spi-flash.c drivers/mtd/spi/Makefile | 6 +- drivers/mtd/spi/sf_internal.h | 38 ++- drivers/mtd/spi/sf_probe.c | 373 +-------------------------- drivers/mtd/spi/{sf_ops.c => spi-flash.c} | 406 ++++++++++++++++++++++++++++-- 4 files changed, 408 insertions(+), 415 deletions(-) rename drivers/mtd/spi/{sf_ops.c => spi-flash.c} (60%) -- 1.9.1

3 47

[U-Boot] [PATCH v2] mailmap: Update Jagan Teki's name and email address
by Jagan Teki 11 Dec '15

11 Dec '15

Used quite different name's and e-mail address, all of them mapped to standard name and e-mail address. Cc: Tom Rini <trini(a)konsulko.com> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> Signed-off-by: Jagan Teki <jteki(a)openedev.com> --- Changes for v2: - Use simple mapping .mailmap | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index e1c6663..2f32fe8 100644 --- a/.mailmap +++ b/.mailmap @@ -13,7 +13,11 @@ Andreas Bießmann <andreas.devel(a)googlemail.com> Aneesh V <aneesh(a)ti.com> Dirk Behme <dirk.behme(a)googlemail.com> Fabio Estevam <fabio.estevam(a)freescale.com> -Jagannadha Sutradharudu Teki <402jagan(a)gmail.com> +Jagan Teki <402jagan(a)gmail.com> +Jagan Teki <jaganna(a)gmail.com> +Jagan Teki <jaganna(a)xilinx.com> +Jagan Teki <jagannadh.teki(a)gmail.com> +Jagan Teki <jagannadha.sutradharudu-teki(a)xilinx.com> Markus Klotzbuecher <mk(a)denx.de> Prabhakar Kushwaha <prabhakar(a)freescale.com> Rajeshwari Shinde <rajeshwari.s(a)samsung.com> -- 1.9.1

2 2

[U-Boot] [PATCH v3] imx_common: check for Serial Downloader in spl_boot_device
by Stefano Babic 11 Dec '15

11 Dec '15

Check for bmode before reading the boot device to check if a serial downloader is started, and returns UART if the serial downloader is set, letting SPL to wait for an image if CONFIG_SPL_YMODEM_SUPPORT is set. This allows to load again a SPL based board with imx_usb_loader together with a tool such as kermit. Signed-off-by: Stefano Babic <sbabic(a)denx.de> CC: Tim Harvey <tharvey(a)gateworks.com> CC: Fabio Estevam <Fabio.Estevam(a)freescale.com> CC: Eric Nelson <eric.nelson(a)boundarydevices.com> Reviewed-by: Eric Nelson <eric(a)nelint.com> Tested-by: Eric Nelson <eric(a)nelint.com> --- Changes in v3: - fix (1 == reg) - rephrase some documentation (E.Nelson) Changes in v2: - Add documentation (S. Roese) - Check just bits 24-25 because reserved bits are set on some variants (E. Nelson) - Set boot device to UART if USB is set to let bmode working as suggested by Eric arch/arm/imx-common/spl.c | 8 ++++++++ doc/README.imx6 | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c index ac6e40e..caa45cf 100644 --- a/arch/arm/imx-common/spl.c +++ b/arch/arm/imx-common/spl.c @@ -20,7 +20,15 @@ u32 spl_boot_device(void) struct src *psrc = (struct src *)SRC_BASE_ADDR; unsigned int gpr10_boot = readl(&psrc->gpr10) & (1 << 28); unsigned reg = gpr10_boot ? readl(&psrc->gpr9) : readl(&psrc->sbmr1); + unsigned int bmode = readl(&psrc->sbmr2); + /* + * Check for BMODE if serial downloader is enabled + * BOOT_MODE - see IMX6DQRM Table 8-1 + */ + if ((((bmode >> 24) & 0x03) == 0x01) || /* Serial Downloader */ + (gpr10_boot && (reg == 1))) + return BOOT_DEVICE_UART; /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg & 0x000000FF) >> 4) { /* EIM: See 8.5.1, Table 8-9 */ diff --git a/doc/README.imx6 b/doc/README.imx6 index 437af2f..e26ab71 100644 --- a/doc/README.imx6 +++ b/doc/README.imx6 @@ -84,3 +84,54 @@ Address: Reading bank 4: Word 0x00000002: 9f027772 00000004 + +2. Using imx_usb_loader for first install with SPL +-------------------------------------------------- + +imx_usb_loader is a very nice tool by BoundaryDevice that +allow to install U-Boot without a JTAG debugger, using +the USB boot mode as described in the manual. It is +a replacement for Freescale's MFGTOOLS. + +The sources can be found here: + + https://github.com/boundarydevices/imx_usb_loader.git + +Booting in USB mode, the i.MX6 announces itself to the Linux Host as: + +Bus 001 Device 111: ID 15a2:0061 Freescale Semiconductor, Inc. + +imx_usb_loader is able to download a single file (u-boot.imx) +to the board. For boards without SPL support, it is enough to +issue the command: + + sudo ../imx_usb_loader/imx_usb -v u-boot.imx + +Getting U-Boot when SPL support is active, it requires +two downloads. imx_usb_loader downloads the SPL into +OCRAM and starts it. SPL will check for a valid u-boot.img, and +because it is not found, it will wait for it using the y-modem +protocol via the console. + +A first install is then possible by combining imx_usb_loader with +another tool such as kermit. + +sudo ../imx_usb_loader/imx_usb -v SPL +kermit kermit_uboot + +and kermit_uboot contains something like this (set line should be adjusted): + +set line /dev/ttyUSB1 +set speed 115200 +SET CARRIER-WATCH OFF +set flow-control none +set handshake none +set prefixing all +set file type bin +set protocol ymodem +send u-boot.img +c + +The last "c" command tells kermit (from ckermit package in most distros) +to switch from command line mode to communication mode, and when the +script is finished, the U-Boot prompt is shown in the same shell. -- 1.9.1

1 0