November 2015 - U-Boot

[U-Boot] Cyclone 5 U-boot 2015.10
by Simon Brown 18 Nov '15

18 Nov '15

Hi, I've been in discussion with Marek on this issue, and he suggested I post to the u-boot mailing list. I've git cloned uboot 2015.10 and checked it out in my own branch. I wasn't about to submit anything back, but this way I hopefully wouldn't break anything if I did! I've created a new board, "Axim". I've setup the DTS, Kconfig, defconfig files etc similar to the Atlas board addition, and things are compiling ok. However, when I run U-boot it gets to a relatively early point and then says "### ERROR ### Please reset the board ###". I can't see it say this ,as it no longer talks to the UART, but I can see that it points to the memory address containing this string in the debugger, so assume that's what it prints out, before entering an endless loop. My setup is slightly odd, in that I need to get U-boot running before I can configure an SD card. This means I'm programming my FPGA via JTAG, then loading the preloader with the ARM DS-5 debugger via JTAG and running it. I get output on the UART (via FPGA pins), to my PC, to suggest that all is running well. I can then upload my u-boot.img file to the preloader using Ymodem (preloader configured to accept this), and I can run U-boot. Before I was using the preconfigured 2013.01.01 U-boot as provided on Rocketboards.org, but since we are using the KSZ9031 chip for our PHY felt I needed a newer version to support this. But 2013.01.01 runs ok, and I can get to the U-boot prompt on the UART, whereas 2015 hangs. Any clues gratefully received. Simon

2 5

[U-Boot] [PATCH v4 00/21] sf: Tunning spi-flash layer
by Jagan Teki 18 Nov '15

18 Nov '15

Previous version link: http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/233262 spi-flash layer need to tune a lot for better code handling and to sync with Linux spi-nor. So below areas got updated in this series. - BAR handling - spi_flash_cmd_wait_ready updates. - Separate core spi-flash handling and spi-flash interface (interface between spi drivers vs spi-flash layer) Currently I'm working on spi-nor framework for u-boot which is slighly same as Linux spi-nor core with addition of u-boot driver model to it. This series will be starting point to add spi-nor functionalities. TODO: - MTD core addition to spi-flash layer. - spi-nor core addition. Code sizes: After: dm: text data bss dec hex filename 354820 12016 221112 587948 8f8ac u-boot non-dm text data bss dec hex filename 354317 11876 221124 587317 8f635 u-boot Before: dm text data bss dec hex filename 354878 12016 221096 587990 8f8d6 u-boot non-dm text data bss dec hex filename 354447 11876 221124 587447 8f6b7 u-boot Testing: $ git clone git://git.denx.de/u-boot-spi.git $ cd u-boot-spi $ git checkout -b spi-nor-tune origin/next-spi-nor-tune thanks! Jagan. Jagan Teki (21): 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 sf: spi_flash_validate_params => spi_flash_scan sf: Move spi_flash_scan code to sf_ops sf: Move the read_id code to sf_ops sf: Move BAR defined code at once place sf: Use static for file-scope functions sf: Fix Makefile sf: Use simple name for register access functions sf: Use flash function pointers in dm_spi_flash_ops sf: Flash power up read-only based on idcode0 sf: Use static for file-scope functions sf: Remove unneeded header includes sf: probe: Use spi_flash_scan in dm-spi-flash sf: Re-factorize spi_flash_probe_tail code dm-sf: Re-factorize spi_flash_std_probe code drivers/mtd/spi/Makefile | 6 +- drivers/mtd/spi/sf_internal.h | 57 ++--- drivers/mtd/spi/sf_ops.c | 488 +++++++++++++++++++++++++++++++++++------- drivers/mtd/spi/sf_probe.c | 446 ++++++-------------------------------- drivers/spi/zynq_spi.c | 6 +- include/spi_flash.h | 19 +- 6 files changed, 494 insertions(+), 528 deletions(-) -- 1.9.1

5 40

[U-Boot] Please pull u-boot-marvell master
by Luka Perkov 18 Nov '15

18 Nov '15

Hi Tom, can you please pull the collected work from Dirk, Kevin, Quentin, Stefan and me on the mvebu and kirkwood SoC? Thank you! The following changes since commit 3d4825446e4258192e1f2302d691a8c0c82a0975: Prepare v2016.01-rc1 (2015-11-16 20:29:51 -0500) are available in the git repository at: git://git.denx.de/u-boot-marvell.git for you to fetch changes up to 6a26748c5e5558073b72ff55de4dc3ea245d3726: arm: kirkwood: ib62x0: drop duplicate defines from CONFIG_SYS_MVFS (2015-11-17 23:41:41 +0100) ---------------------------------------------------------------- Dirk Eibach (1): arm: mvebu: Fix SAR1_CPU_CORE_MASK Kevin Smith (3): arm: mvebu: a38x: Remove unsupported topologies arm: mvebu: a38x: Add const to some function calls arm: mvebu: a38x: serdes specification cleanup Luka Perkov (6): arm: kirkwood: ib62x0: drop CONFIG_MACH_TYPE arm: kirkwood: ib62x0: build u-boot.kwb arm: kirkwood: ib62x0: drop CONFIG_CMD_ENV define arm: kirkwood: ib62x0: make use of defconfig arm: kirkwood: ib62x0: drop dev CONFIG_OF_LIBFDT arm: kirkwood: ib62x0: drop duplicate defines from CONFIG_SYS_MVFS Quentin Armitage (7): arm: kirkwood: standardise the configuration arm: kirkwood: Remove duplicate definition of CONFIG_CMD_FAT arm: kirkwood: Move configuration of some commands to _defconfig files arm: kirkwood: Use common definition for filesystems arm: kirkwood: Align configuration files arm: kirkwood: Remove duplicate definition from dreamplug.h arm: kirkwood: Move common definitions into common file Stefan Roese (1): tools/kwbimage.c: Fix generation of binary header arch/arm/mach-mvebu/serdes/a38x/Makefile | 1 - arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c | 13 +- arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.h | 2 +- .../serdes/a38x/high_speed_env_spec-38x.c | 1 - .../mach-mvebu/serdes/a38x/high_speed_env_spec.c | 103 +- .../mach-mvebu/serdes/a38x/high_speed_env_spec.h | 8 +- .../serdes/a38x/high_speed_topology_spec-38x.c | 1009 -------------------- .../serdes/a38x/high_speed_topology_spec.h | 124 --- arch/arm/mach-mvebu/serdes/a38x/seq_exec.c | 1 - arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.c | 151 --- arch/arm/mach-mvebu/serdes/a38x/sys_env_lib.h | 2 - board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 17 + configs/dreamplug_defconfig | 5 + configs/guruplug_defconfig | 5 + configs/ib62x0_defconfig | 5 + configs/sheevaplug_defconfig | 5 + drivers/ddr/marvell/a38x/ddr3_a38x.h | 5 - .../ddr/marvell/a38x/ddr3_hws_hw_training_def.h | 7 +- drivers/ddr/marvell/a38x/ddr3_init.c | 72 -- include/configs/dreamplug.h | 34 +- include/configs/guruplug.h | 52 +- include/configs/ib62x0.h | 30 +- include/configs/mv-plug-common.h | 64 ++ include/configs/sheevaplug.h | 49 +- tools/kwbimage.c | 12 +- 25 files changed, 175 insertions(+), 1602 deletions(-) delete mode 100644 arch/arm/mach-mvebu/serdes/a38x/high_speed_topology_spec-38x.c delete mode 100644 arch/arm/mach-mvebu/serdes/a38x/high_speed_topology_spec.h create mode 100644 include/configs/mv-plug-common.h Regards, Luka

2 1

[U-Boot] Please pull ARC changes
by Alexey Brodkin 18 Nov '15

18 Nov '15

Hi Tom, The following changes since commit 3d4825446e4258192e1f2302d691a8c0c82a0975: Prepare v2016.01-rc1 (2015-11-16 20:29:51 -0500) are available in the git repository at: git://git.denx.de/u-boot-arc.git for you to fetch changes up to fb2dea60e8f355ae00d427db09112a90839c96ec: board: axs10x switch serial port and Ethernet to driver model (2015-11-18 00:39:22 +0300) ---------------------------------------------------------------- Alexey Brodkin (3): arc: add stubs for map_physmem() and unmap_physmem() arc: add empty asm/processor.h to satisfy compilation of USB code board: axs10x switch serial port and Ethernet to driver model arch/arc/dts/Makefile | 1 + arch/arc/dts/axs10x.dts | 45 +++++++++++++++++++++++++++++++++++++++++++++ arch/arc/include/asm/io.h | 24 ++++++++++++++++++++++++ arch/arc/include/asm/processor.h | 12 ++++++++++++ board/synopsys/axs101/axs101.c | 12 ------------ configs/axs101_defconfig | 11 ++++++++++- configs/axs103_defconfig | 11 ++++++++++- include/configs/axs101.h | 31 ++++++------------------------- 8 files changed, 108 insertions(+), 39 deletions(-) create mode 100644 arch/arc/dts/axs10x.dts create mode 100644 arch/arc/include/asm/processor.h Regards, Alexey

2 1

[U-Boot] [PATCH v5 0/2] Make most DDR non-secure in MMU while keep a small block secure
by York Sun 18 Nov '15

18 Nov '15

This set is to change MMU tables so DDR is in non-secure mode that non-secure master such as SDHC DMA can access the data. To mix secure and non-secure MMU entries, the MMU tables themselves have to be in secure memory. A small portion memory is reserved at the end of DDR (before debug server and MC) to host secure application and the MMU tables. This is different from existing armv7 secure_ram_addr() solution. U-boot can run in the middle of memory if the memory is large. Having security memory at the very end simplifies MMU setup. Tested on LS2085AQDS with a known non-secure master test. Changes in v5: Put ifdef where gd->secure_ram is used Changes in v4: Drop RFC from patch prefix Drop excessive mmu table for secure ram for early MMU Update commit message accordingly Mark QBMan cacheable portal memory non-secure Changes in v3: Put ifdef around secure_ram Move defining CONFIG_SYS_MEM_RESERVE_SECURE to patch 2/2 Replace CONFIG_FSL_PPA_RESERVED_DRAM_SIZE with CONFIG_SYS_MEM_RESERVE_SECURE Sanity check gd->secure_ram before using Define CONFIG_SYS_MEM_RESERVE_SECURE in SoC header file Include ls1043ardb Modified commit message. Changes in v2: Do not use CONFIG_SYS_MEM_TOP_HIDE mechanism Move gd->arch.secure_ram to gd->secure_ram. Change the calculation of gd->secure_ram accordingly. Chnage commit message slightly accordingly. Changes in v1: Initial patch. Depends on http://patchwork.ozlabs.org/patch/540248/ York Sun (2): Reserve secure memory armv8: fsl-layerscape: Make DDR non secure in MMU tables README | 8 ++ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 110 +++++++++++++++++++-- arch/arm/include/asm/arch-fsl-layerscape/config.h | 6 ++ arch/arm/include/asm/arch-fsl-layerscape/cpu.h | 14 ++- board/freescale/ls1043ardb/ddr.c | 4 + board/freescale/ls2085a/ddr.c | 15 +++ board/freescale/ls2085aqds/ddr.c | 15 +++ board/freescale/ls2085ardb/ddr.c | 15 +++ common/board_f.c | 9 ++ common/cmd_bdinfo.c | 4 + include/asm-generic/global_data.h | 13 +++ 11 files changed, 198 insertions(+), 15 deletions(-) -- 1.7.9.5

1 2

[U-Boot] [PATCH] arc: add empty asm/processor.h to satisfy compilation of USB code
by Alexey Brodkin 17 Nov '15

17 Nov '15

common/usb.c unconditionally includes <asm/processor.h> And now to allow USB support on ARC boards we have to have that header. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- arch/arc/include/asm/processor.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 arch/arc/include/asm/processor.h diff --git a/arch/arc/include/asm/processor.h b/arch/arc/include/asm/processor.h new file mode 100644 index 0000000..6355423 --- /dev/null +++ b/arch/arc/include/asm/processor.h @@ -0,0 +1,12 @@ +/* + * Copyright (C) 2015 Synopsys, Inc. All rights reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _ASM_ARC_PROCESSOR_H +#define _ASM_ARC_PROCESSOR_H + +/* This file is required by some generic code like USB etc */ + +#endif /* _ASM_ARC_PROCESSOR_H */ -- 2.4.3

1 1

[U-Boot] [PATCH] board: axs10x switch serial port and Ethernet to driver model
by Alexey Brodkin 17 Nov '15

17 Nov '15

With this change Synopsys DesignWare SDP board is switched to driver model for both serial port (serial_dw) and Ethernet (Designware GMAC). This simplifies include/configs/axs101.h and allows for reuse of Linux's Device Tree description. For simplicity Linux's .dts files are not blindly copied but only very few extracts of them are really used (those that are supported in U-Boot at the moment). Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> Cc: Simon Glass <sjg(a)chromium.org> --- arch/arc/dts/Makefile | 1 + arch/arc/dts/axs10x.dts | 45 ++++++++++++++++++++++++++++++++++++++++++ board/synopsys/axs101/axs101.c | 12 ----------- configs/axs101_defconfig | 11 ++++++++++- configs/axs103_defconfig | 11 ++++++++++- include/configs/axs101.h | 31 ++++++----------------------- 6 files changed, 72 insertions(+), 39 deletions(-) create mode 100644 arch/arc/dts/axs10x.dts diff --git a/arch/arc/dts/Makefile b/arch/arc/dts/Makefile index d481fcd..d4772ec 100644 --- a/arch/arc/dts/Makefile +++ b/arch/arc/dts/Makefile @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-2.0+ # +dtb-$(CONFIG_TARGET_AXS101) += axs10x.dtb dtb-$(CONFIG_TARGET_ARCANGEL4) += arcangel4.dtb dtb-$(CONFIG_TARGET_TB100) += abilis_tb100.dtb diff --git a/arch/arc/dts/axs10x.dts b/arch/arc/dts/axs10x.dts new file mode 100644 index 0000000..8fe1837 --- /dev/null +++ b/arch/arc/dts/axs10x.dts @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2015 Synopsys, Inc. All rights reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + */ +/dts-v1/; + +#include "skeleton.dtsi" + +/ { + #address-cells = <1>; + #size-cells = <1>; + + aliases { + console = &uart0; + }; + + clocks { + apbclk: apbclk { + compatible = "fixed-clock"; + clock-frequency = <50000000>; + #clock-cells = <0>; + }; + }; + + uart0: serial0@e0022000 { + compatible = "snps,dw-apb-uart"; + reg = <0xe0022000 0x1000>; + reg-shift = <2>; + reg-io-width = <4>; + }; + + ethernet@e0018000 { + #interrupt-cells = <1>; + compatible = "altr,socfpga-stmmac"; + reg = < 0xe0018000 0x2000 >; + interrupts = < 25 >; + interrupt-names = "macirq"; + phy-mode = "gmii"; + snps,pbl = < 32 >; + clocks = <&apbclk>; + clock-names = "stmmaceth"; + max-speed = <100>; + }; +}; diff --git a/board/synopsys/axs101/axs101.c b/board/synopsys/axs101/axs101.c index aa446b9..84ee2bf 100644 --- a/board/synopsys/axs101/axs101.c +++ b/board/synopsys/axs101/axs101.c @@ -7,8 +7,6 @@ #include <common.h> #include <dwmmc.h> #include <malloc.h> -#include <netdev.h> -#include <phy.h> #include "axs10x.h" DECLARE_GLOBAL_DATA_PTR; @@ -35,16 +33,6 @@ int board_mmc_init(bd_t *bis) return 0; } -int board_eth_init(bd_t *bis) -{ - if (designware_initialize(ARC_DWGMAC_BASE, - PHY_INTERFACE_MODE_RGMII) >= 0) - return 1; - - return 0; -} - - #define AXS_MB_CREG 0xE0011000 int board_early_init_f(void) diff --git a/configs/axs101_defconfig b/configs/axs101_defconfig index fdb3149..8e5d2e5 100644 --- a/configs/axs101_defconfig +++ b/configs/axs101_defconfig @@ -1,12 +1,21 @@ CONFIG_ARC=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARC_CACHE_LINE_SHIFT=5 +CONFIG_DM_SERIAL=y CONFIG_SYS_CLK_FREQ=750000000 CONFIG_SYS_TEXT_BASE=0x81000000 +CONFIG_DEFAULT_DEVICE_TREE="axs10x" CONFIG_SYS_PROMPT="AXS# " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set -CONFIG_NETDEVICES=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y +CONFIG_OF_CONTROL=y +CONFIG_OF_EMBED=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM=y +CONFIG_CLK=y +CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/axs103_defconfig b/configs/axs103_defconfig index b3dbb8d..cbd63fe 100644 --- a/configs/axs103_defconfig +++ b/configs/axs103_defconfig @@ -1,11 +1,20 @@ CONFIG_ARC=y CONFIG_ISA_ARCV2=y +CONFIG_DM_SERIAL=y CONFIG_SYS_CLK_FREQ=50000000 CONFIG_SYS_TEXT_BASE=0x81000000 +CONFIG_DEFAULT_DEVICE_TREE="axs10x" CONFIG_SYS_PROMPT="AXS# " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set -CONFIG_NETDEVICES=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y +CONFIG_OF_CONTROL=y +CONFIG_OF_EMBED=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM=y +CONFIG_CLK=y +CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/include/configs/axs101.h b/include/configs/axs101.h index 450291c..9a7e0dc 100644 --- a/include/configs/axs101.h +++ b/include/configs/axs101.h @@ -39,6 +39,8 @@ #define CONFIG_BOARD_TYPES #define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_OF_LIBFDT + /* * NAND Flash configuration */ @@ -48,28 +50,14 @@ /* * UART configuration - * - * CONFIG_CONS_INDEX = 1 - Debug UART - * CONFIG_CONS_INDEX = 4 - FPGA UART connected to FTDI/USB */ -#define CONFIG_CONS_INDEX 4 +#define CONFIG_DW_SERIAL #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE -4 -#if (CONFIG_CONS_INDEX == 1) - /* Debug UART */ -# define CONFIG_SYS_NS16550_CLK 33333000 -#else - /* FPGA UARTs use different clock */ -# define CONFIG_SYS_NS16550_CLK 33333333 -#endif -#define CONFIG_SYS_NS16550_COM1 (ARC_APB_PERIPHERAL_BASE + 0x5000) -#define CONFIG_SYS_NS16550_COM2 (ARC_FPGA_PERIPHERAL_BASE + 0x20000) -#define CONFIG_SYS_NS16550_COM3 (ARC_FPGA_PERIPHERAL_BASE + 0x21000) -#define CONFIG_SYS_NS16550_COM4 (ARC_FPGA_PERIPHERAL_BASE + 0x22000) +#define CONFIG_SYS_NS16550_CLK 33333333 #define CONFIG_SYS_NS16550_MEM32 - #define CONFIG_BAUDRATE 115200 + /* * I2C configuration */ @@ -119,18 +107,11 @@ #define CONFIG_DW_AUTONEG /* - * Command line configuration + * Commands still not supported in Kconfig */ -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_EEPROM #define CONFIG_CMD_FAT -#define CONFIG_CMD_I2C #define CONFIG_CMD_MMC #define CONFIG_CMD_NAND -#define CONFIG_CMD_PING -#define CONFIG_CMD_RARP - -#define CONFIG_OF_LIBFDT #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 16 -- 2.4.3

2 2

[U-Boot] [PATCH] arc: add stubs for map_physmem() and unmap_physmem()
by Alexey Brodkin 17 Nov '15

17 Nov '15

Up until now there was no need in those stubs. But since following commit compilation of U-Boot on ARC is broken: ------------------------>8---------------------- commit 7861204c9af7fec1ea9b41541c272516235a6c93 Author: Stephen Warren <swarren(a)wwwdotorg.org> Date: Sat Oct 3 13:56:46 2015 -0600 itest: make memory access work under sandbox itest accesses memory, and hence must map/unmap it. Without doing so, it accesses invalid addresses and crashes. Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> Reviewed-by: Simon Glass <sjg(a)chromium.org> ------------------------>8---------------------- That's because CMD_ITEST is enabled by default in common/Kconfig and now map_physmem()/unmap_physmem() is used there. So this patch adds missing stubs for ARC. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Stephen Warren <swarren(a)wwwdotorg.org> Cc: Simon Glass <sjg(a)chromium.org> --- arch/arc/include/asm/io.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/arc/include/asm/io.h b/arch/arc/include/asm/io.h index 24b7337..281682c 100644 --- a/arch/arc/include/asm/io.h +++ b/arch/arc/include/asm/io.h @@ -10,6 +10,30 @@ #include <linux/types.h> #include <asm/byteorder.h> +/* + * Given a physical address and a length, return a virtual address + * that can be used to access the memory range with the caching + * properties specified by "flags". + */ +#define MAP_NOCACHE (0) +#define MAP_WRCOMBINE (0) +#define MAP_WRBACK (0) +#define MAP_WRTHROUGH (0) + +static inline void * +map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) +{ + return (void *)((unsigned long)paddr); +} + +/* + * Take down a mapping set up by map_physmem(). + */ +static inline void unmap_physmem(void *vaddr, unsigned long flags) +{ + +} + static inline void sync(void) { /* Not yet implemented */ -- 2.4.3

3 11

[U-Boot] [PATCH v2] spi: sf_ops: Check the return value from spi_flash_cmd_read_status()
by Fabio Estevam 17 Nov '15

17 Nov '15

From: Fabio Estevam <fabio.estevam(a)freescale.com> We should check the return value from spi_flash_cmd_read_status() and propagate it in the case of error. This fixes a defect caught by Coverity. Reported-by: Tom Rini <trini(a)konsulko.com> Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - Use if (ret < 0) (Jagan) drivers/mtd/spi/sf_ops.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 384224d..6cc2d31 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -663,8 +663,11 @@ int stm_lock(struct spi_flash *flash, u32 ofs, size_t len) u8 status_old, status_new; u8 mask = SR_BP2 | SR_BP1 | SR_BP0; u8 shift = ffs(mask) - 1, pow, val; + int ret; - spi_flash_cmd_read_status(flash, &status_old); + ret = spi_flash_cmd_read_status(flash, &status_old); + if (ret < 0) + return ret; /* SPI NOR always locks to the end */ if (ofs + len != flash->size) { @@ -714,8 +717,11 @@ int stm_unlock(struct spi_flash *flash, u32 ofs, size_t len) uint8_t status_old, status_new; u8 mask = SR_BP2 | SR_BP1 | SR_BP0; u8 shift = ffs(mask) - 1, pow, val; + int ret; - spi_flash_cmd_read_status(flash, &status_old); + ret = spi_flash_cmd_read_status(flash, &status_old); + if (ret < 0) + return ret; /* Cannot unlock; would unlock larger region than requested */ if (stm_is_locked_sr(flash, status_old, ofs - flash->erase_size, -- 1.9.1

2 1

[U-Boot] [PATCH v3] sf_probe: Add lock ops for SST SPI NOR flash
by Fabio Estevam 17 Nov '15

17 Nov '15

From: Fabio Estevam <fabio.estevam(a)freescale.com> SST SPI NOR flash has the same locking programming bits as ST Micro. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> Reviewed-by: Jagan Teki <jteki(a)openedev.com> --- Changes since v2: - Add parenthesis (Jagan) drivers/mtd/spi/sf_internal.h | 1 + drivers/mtd/spi/sf_ops.c | 4 ++-- drivers/mtd/spi/sf_probe.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 8793f18..85c8a89 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -64,6 +64,7 @@ enum spi_nor_option_flags { #define SPI_FLASH_CFI_MFR_SPANSION 0x01 #define SPI_FLASH_CFI_MFR_STMICRO 0x20 #define SPI_FLASH_CFI_MFR_MACRONIX 0xc2 +#define SPI_FLASH_CFI_MFR_SST 0xbf #define SPI_FLASH_CFI_MFR_WINBOND 0xef /* Erase commands */ diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 6cc2d31..f045471 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -583,7 +583,7 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len, } #endif -#ifdef CONFIG_SPI_FLASH_STMICRO +#if defined(CONFIG_SPI_FLASH_STMICRO) || defined(CONFIG_SPI_FLASH_SST) static void stm_get_locked_range(struct spi_flash *flash, u8 sr, loff_t *ofs, u32 *len) { @@ -756,4 +756,4 @@ int stm_unlock(struct spi_flash *flash, u32 ofs, size_t len) return 0; } -#endif /* CONFIG_SPI_FLASH_STMICRO */ +#endif diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index bc05d30..fea6c24 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -184,8 +184,9 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode, /* lock hooks are flash specific - assign them based on idcode0 */ switch (idcode[0]) { -#ifdef CONFIG_SPI_FLASH_STMICRO +#if defined(CONFIG_SPI_FLASH_STMICRO) || defined(CONFIG_SPI_FLASH_SST) case SPI_FLASH_CFI_MFR_STMICRO: + case SPI_FLASH_CFI_MFR_SST: flash->flash_lock = stm_lock; flash->flash_unlock = stm_unlock; flash->flash_is_locked = stm_is_locked; -- 1.9.1

2 4