November 2015 - U-Boot

[U-Boot] [PATCH v2 00/26] usb: Drop requirement for USB unbinding, add tests
by Simon Glass 20 Nov '15

20 Nov '15

There was quite a bit of discussion about the change that required the unbinding of USB devices for the subsystem to function correctly. E.g. https://patchwork.ozlabs.org/patch/485637/ The key issue is the usb_get_dev_index() function which is not a good API for driver model. We can drop use of this function once everything is converted to driver model. Then I believe the problems raised by Hans go away. For now we can add a deprecation warning on the function. It is easy to convert USB keyboards to driver model. This series includes a patch for that. This series also includes reverts for the three commits which as discussed I would like to drop. U-Boot should be able to run normally and exit without unbinding anything. Also included are some tests for the 'usb tree' command. To make this work, console recording is implemented. Finally, a USB keyboard driver is provided for sandbox, so that this part of the stack can be tested automatically. Changes in v2: - Add various patches to support USB keyboards and additional tests Simon Glass (26): sandbox: Add a way to skip time delays dm: usb: Avoid time delays in sandbox tests Move console definitions into a new console.h file Drop config.h header from display_options.c Add a circular memory buffer implementation console: Add a console buffer sandbox: Enable console recording and silent console test: Record and silence console in tests usb: Refactor USB tree output code for testing dm: core: Add safe device iteration macros sandbox: usb: Allow dynamic emulated USB device descriptors sandbox: usb: Allow up to 4 emulated devices on a hub sandbox: usb: Allow finding a USB emulator for a device Revert "dm: usb: Rename usb_find_child to usb_find_emul_child" Revert "dm: usb: Use device_unbind_children to clean up usb devs on stop" Revert "dm: Export device_remove_children / device_unbind_children" dm: usb: Deprecate usb_get_dev_index() dm: usb: Remove inactive children after a bus scan dm: test: usb: Add tests for the 'usb tree' command dm: test: usb: Add a test for device reordering usb: Drop unused code in usb_kbd.c usb: Avoid open-coded USB constants in usb_kbd.c usb: sandbox: Add support for interrupt operations usb: sandbox: Add a USB emulation driver sandbox: Enable USB keyboard dm: test: usb: sandbox: Add keyboard tests for sandbox arch/blackfin/lib/cmd_cache_dump.c | 1 + arch/powerpc/cpu/mpc8260/ether_fcc.c | 1 + arch/powerpc/cpu/mpc8260/i2c.c | 1 + arch/powerpc/cpu/mpc8xx/i2c.c | 1 + arch/sandbox/cpu/cpu.c | 5 +- arch/sandbox/cpu/start.c | 8 + arch/sandbox/cpu/state.c | 14 ++ arch/sandbox/dts/test.dts | 19 +- arch/sandbox/include/asm/state.h | 20 ++ arch/sandbox/include/asm/test.h | 2 + arch/sh/lib/board.c | 1 + arch/sparc/lib/board.c | 1 + board/Arcturus/ucp1020/spl.c | 1 + board/astro/mcf5373l/fpga.c | 1 + board/cobra5272/flash.c | 1 + board/esd/common/cmd_loadpci.c | 1 + board/esd/cpci405/cpci405.c | 1 + board/esd/pmc405de/pmc405de.c | 1 + board/esd/pmc440/cmd_pmc440.c | 1 + board/esd/pmc440/pmc440.c | 1 + board/esd/vme8349/caddy.c | 1 + board/freescale/b4860qds/spl.c | 1 + board/freescale/c29xpcie/spl.c | 1 + board/freescale/mpc8569mds/mpc8569mds.c | 1 + board/freescale/p1010rdb/spl.c | 1 + board/freescale/p1022ds/spl.c | 1 + board/freescale/p1_p2_rdb_pc/spl.c | 1 + board/freescale/t102xqds/spl.c | 1 + board/freescale/t102xrdb/spl.c | 1 + board/freescale/t104xrdb/spl.c | 1 + board/freescale/t208xqds/spl.c | 1 + board/freescale/t208xrdb/spl.c | 1 + board/freescale/t4qds/spl.c | 1 + board/freescale/t4rdb/spl.c | 1 + board/gdsys/common/cmd_ioloop.c | 1 + board/inka4x0/inkadiag.c | 1 + board/lwmon5/kbd.c | 1 + board/mpl/common/kbd.c | 1 + board/mpl/pati/pati.c | 1 + board/renesas/sh7785lcr/selfcheck.c | 1 + board/tqc/tqm5200/cmd_stk52xx.c | 1 + board/tqc/tqm5200/tqm5200.c | 1 + board/xes/xpedite1000/xpedite1000.c | 1 + common/Kconfig | 28 +++ common/autoboot.c | 1 + common/board_f.c | 11 + common/board_r.c | 11 + common/cli.c | 1 + common/cli_hush.c | 1 + common/cli_simple.c | 1 + common/cmd_armflash.c | 1 + common/cmd_dcr.c | 1 + common/cmd_dfu.c | 1 + common/cmd_fastboot.c | 1 + common/cmd_fpgad.c | 1 + common/cmd_fuse.c | 1 + common/cmd_i2c.c | 1 + common/cmd_load.c | 1 + common/cmd_mem.c | 2 + common/cmd_misc.c | 1 + common/cmd_mmc.c | 1 + common/cmd_nand.c | 1 + common/cmd_nvedit.c | 1 + common/cmd_otp.c | 1 + common/cmd_pci.c | 1 + common/cmd_usb.c | 59 +++-- common/cmd_usb_mass_storage.c | 1 + common/command.c | 1 + common/console.c | 51 +++- common/iomux.c | 1 + common/main.c | 1 + common/usb_hub.c | 10 +- common/usb_kbd.c | 41 +-- configs/sandbox_defconfig | 5 + drivers/block/fsl_sata.c | 1 + drivers/core/device-remove.c | 22 +- drivers/fpga/ACEX1K.c | 1 + drivers/fpga/virtex2.c | 1 + drivers/fpga/zynqpl.c | 1 + drivers/i2c/adi_i2c.c | 1 + drivers/input/input.c | 1 + drivers/input/keyboard.c | 1 + drivers/misc/cbmem_console.c | 2 +- drivers/mtd/cfi_flash.c | 1 + drivers/mtd/nand/bfin_nand.c | 1 + drivers/net/e1000_spi.c | 1 + drivers/net/keystone_net.c | 1 + drivers/net/phy/phy.c | 1 + drivers/net/vsc7385.c | 1 + drivers/power/battery/bat_trats.c | 1 + drivers/spi/bfin_spi.c | 1 + drivers/spi/bfin_spi6xx.c | 1 + drivers/spi/sh_qspi.c | 1 + drivers/spi/sh_spi.c | 1 + drivers/usb/emul/Makefile | 1 + drivers/usb/emul/sandbox_flash.c | 48 ++-- drivers/usb/emul/sandbox_hub.c | 2 +- drivers/usb/emul/sandbox_keyb.c | 241 ++++++++++++++++++ drivers/usb/emul/usb-emul-uclass.c | 29 ++- drivers/usb/gadget/ether.c | 1 + drivers/usb/gadget/f_mass_storage.c | 1 + drivers/usb/gadget/f_thor.c | 1 + drivers/usb/host/r8a66597-hcd.c | 1 + drivers/usb/host/usb-sandbox.c | 19 ++ drivers/usb/host/usb-uclass.c | 54 +++- drivers/usb/musb-new/musb_uboot.c | 1 + examples/standalone/mem_to_mem_idma2intr.c | 1 + examples/standalone/smc911x_eeprom.c | 1 + include/asm-generic/global_data.h | 6 + include/common.h | 17 -- include/configs/sandbox.h | 3 +- include/console.h | 52 ++++ include/dm/device-internal.h | 26 -- include/dm/device.h | 12 + include/dm/uclass.h | 15 ++ include/linux/usb/ch9.h | 20 ++ include/membuff.h | 246 ++++++++++++++++++ include/usb.h | 29 +++ lib/Makefile | 1 + lib/display_options.c | 2 +- lib/gunzip.c | 1 + lib/membuff.c | 390 +++++++++++++++++++++++++++++ net/net.c | 1 + test/dm/test-main.c | 12 + test/dm/usb.c | 241 ++++++++++++++++++ test/ut.c | 4 + 126 files changed, 1717 insertions(+), 149 deletions(-) create mode 100644 drivers/usb/emul/sandbox_keyb.c create mode 100644 include/console.h create mode 100644 include/membuff.h create mode 100644 lib/membuff.c -- 2.6.0.rc2.230.g3dd15c0

4 66

[U-Boot] Is patchwork down?
by Simon Glass 20 Nov '15

20 Nov '15

Hi, I haven't been able to connect for quite a few hours. Is anyone else having a problem? Regards, Simon

2 2

[U-Boot] [PATCH v6 00/23] Bring up rk3036 uboot
by Lin Huang 20 Nov '15

20 Nov '15

This series patch bring up rk3036 uboot, since rk3036 only 4K size SRAM for SPL, so in SPL stage only support timer, uart, sdram driver, and back to bootrom when finish ddr initial, and boot up second stage from bootrom.You can boot to command line(mmc info etc) for now use this patchset. Jeffy Chen (2): rockchip: Add max spl size & spl header configs rockchip: Add support for rk's second level loader Lin Huang (21): rockchip: add timer driver rockchip: move SYS_MALLOC_F_LEN to rk3288 own Kconfig rockchip: rename board-spl.c to rk3288-board-spl.c rockchip: add config decide whether to build common.c dm: core: Add SPL Kconfig for REGMAP and SYSCON rockchip: serial driver support rk3036 rockchip: Bring in RK3036 device tree file includes and bindings rockchip: rk3036: Add clock driver rockchip: rk3036: Add header files for GRF rockchip: rk3036: Add Soc reset driver rockchip: rk3036: Add a simple syscon driver rockchip: rk3036: Add pinctrl driver mmc: dw_mmc: move data transfer as a separate function mmc: dw_mmc: support fifo mode in dwc mmc driver rockchip: mmc: use non-removable property to disginguish emmc and sdcard register rockchip: mmc: get the fifo mode and fifo depth property from dts rockchip: add early uart driver rockchip: add rk3036 sdram driver rockchip: rk3036: Add core Soc start-up code rockchip: Add basic support for evb-rk3036 board rockchip: doc: show packet rk3036 uboot image arch/arm/dts/Makefile | 3 +- arch/arm/dts/rk3036-sdk.dts | 46 ++ arch/arm/dts/rk3036.dtsi | 428 ++++++++++++ arch/arm/include/asm/arch-rockchip/cru_rk3036.h | 168 +++++ arch/arm/include/asm/arch-rockchip/grf_rk3036.h | 493 ++++++++++++++ arch/arm/include/asm/arch-rockchip/sdram_rk3036.h | 341 ++++++++++ arch/arm/include/asm/arch-rockchip/timer.h | 22 + arch/arm/include/asm/arch-rockchip/uart.h | 44 ++ arch/arm/mach-rockchip/Kconfig | 28 +- arch/arm/mach-rockchip/Makefile | 10 +- arch/arm/mach-rockchip/board-spl.c | 294 --------- arch/arm/mach-rockchip/board.c | 1 + arch/arm/mach-rockchip/rk3036-board-spl.c | 55 ++ arch/arm/mach-rockchip/rk3036/Kconfig | 23 + arch/arm/mach-rockchip/rk3036/Makefile | 13 + arch/arm/mach-rockchip/rk3036/reset_rk3036.c | 45 ++ arch/arm/mach-rockchip/rk3036/save_boot_param.S | 32 + arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 764 ++++++++++++++++++++++ arch/arm/mach-rockchip/rk3036/syscon_rk3036.c | 21 + arch/arm/mach-rockchip/rk3288-board-spl.c | 277 ++++++++ arch/arm/mach-rockchip/rk3288/Kconfig | 9 + arch/arm/mach-rockchip/rk_early_print.c | 63 ++ arch/arm/mach-rockchip/rk_timer.c | 48 ++ board/evb_rk3036/evb_rk3036/Kconfig | 15 + board/evb_rk3036/evb_rk3036/MAINTAINERS | 0 board/evb_rk3036/evb_rk3036/Makefile | 7 + board/evb_rk3036/evb_rk3036/evb_rk3036.c | 49 ++ configs/chromebook_jerry_defconfig | 2 + configs/evb-rk3036_defconfig | 26 + configs/firefly-rk3288_defconfig | 2 + configs/sandbox_defconfig | 2 + doc/README.rockchip | 11 + drivers/clk/Makefile | 1 + drivers/clk/clk_rk3036.c | 414 ++++++++++++ drivers/core/Kconfig | 19 + drivers/core/Makefile | 4 +- drivers/mmc/dw_mmc.c | 140 ++-- drivers/mmc/rockchip_dw_mmc.c | 27 +- drivers/pinctrl/Kconfig | 9 + drivers/pinctrl/rockchip/Makefile | 1 + drivers/pinctrl/rockchip/pinctrl_rk3036.c | 276 ++++++++ drivers/serial/serial_rockchip.c | 1 + include/configs/evb_rk3036.h | 12 + include/configs/rk3036_common.h | 103 +++ include/configs/rk3288_common.h | 8 +- include/dt-bindings/clock/rk3036-cru.h | 186 ++++++ include/dwmmc.h | 5 + tools/Makefile | 6 + tools/rkcommon.c | 26 +- tools/rkcommon.h | 4 +- tools/rkimage.c | 2 +- tools/rksd.c | 6 +- tools/rkspi.c | 6 +- 53 files changed, 4222 insertions(+), 376 deletions(-) create mode 100644 arch/arm/dts/rk3036-sdk.dts create mode 100644 arch/arm/dts/rk3036.dtsi create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3036.h create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3036.h create mode 100644 arch/arm/include/asm/arch-rockchip/sdram_rk3036.h create mode 100644 arch/arm/include/asm/arch-rockchip/timer.h create mode 100644 arch/arm/include/asm/arch-rockchip/uart.h delete mode 100644 arch/arm/mach-rockchip/board-spl.c create mode 100644 arch/arm/mach-rockchip/rk3036-board-spl.c create mode 100644 arch/arm/mach-rockchip/rk3036/Kconfig create mode 100644 arch/arm/mach-rockchip/rk3036/Makefile create mode 100644 arch/arm/mach-rockchip/rk3036/reset_rk3036.c create mode 100644 arch/arm/mach-rockchip/rk3036/save_boot_param.S create mode 100644 arch/arm/mach-rockchip/rk3036/sdram_rk3036.c create mode 100644 arch/arm/mach-rockchip/rk3036/syscon_rk3036.c create mode 100644 arch/arm/mach-rockchip/rk3288-board-spl.c create mode 100644 arch/arm/mach-rockchip/rk_early_print.c create mode 100644 arch/arm/mach-rockchip/rk_timer.c create mode 100644 board/evb_rk3036/evb_rk3036/Kconfig create mode 100644 board/evb_rk3036/evb_rk3036/MAINTAINERS create mode 100644 board/evb_rk3036/evb_rk3036/Makefile create mode 100644 board/evb_rk3036/evb_rk3036/evb_rk3036.c create mode 100644 configs/evb-rk3036_defconfig create mode 100644 drivers/clk/clk_rk3036.c create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3036.c create mode 100644 include/configs/evb_rk3036.h create mode 100644 include/configs/rk3036_common.h create mode 100644 include/dt-bindings/clock/rk3036-cru.h -- 1.9.1

4 53

[U-Boot] [PATCH 0/2] rockchip: fixes in config files
by Ariel D'Alessandro 19 Nov '15

19 Nov '15

Hi, This patchset fixes some issues found in Rockchip's configuration due to previuos patches that add/modified some u-boot config options. It is built on top of Lin Huang's patchset: [PATCH v5 00/21] Bring up rk3036 uboot Best regards, Ariel D'Alessandro (2): rockchip: Turn on CONFIG_DEBUG_UART_NS16550 in defconfigs rockchip: move SYS_MALLOC_SIMPLE to mach-rockchip Kconfig arch/arm/mach-rockchip/Kconfig | 3 +++ configs/chromebook_jerry_defconfig | 1 + configs/firefly-rk3288_defconfig | 3 ++- include/configs/rk3036_common.h | 4 ---- include/configs/rk3288_common.h | 4 ---- 5 files changed, 6 insertions(+), 9 deletions(-) -- 2.6.2

3 7

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

19 Nov '15

Hi Tom, Please pull this PR. thanks! Jagan. 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-spi.git master for you to fetch changes up to 3e56ecec435d30e25fcffb971f8c9627e85ac1df: sf: Correct flash->flags for SST flash (2015-11-18 12:52:05 +0530) ---------------------------------------------------------------- Bin Meng (1): sf: Correct flash->flags for SST flash Fabio Estevam (2): sf: Add lock ops for SST SPI NOR flash spi: sf_ops: Check the return value from spi_flash_cmd_read_status() Jagan Teki (1): sf: Remove eeprom_m95xxx test driver Vignesh R (2): spi: ti_qspi: Add dummy readl for bus sync ARM: am43xx: Enable QUAD read and EDMA support for ti_qspi arch/arm/include/asm/arch-am33xx/hardware_am43xx.h | 3 + drivers/mtd/spi/Makefile | 1 - drivers/mtd/spi/eeprom_m95xxx.c | 111 --------------------- drivers/mtd/spi/sf_internal.h | 1 + drivers/mtd/spi/sf_ops.c | 14 ++- drivers/mtd/spi/sf_probe.c | 12 ++- drivers/spi/ti_qspi.c | 2 + include/configs/am43xx_evm.h | 2 + 8 files changed, 25 insertions(+), 121 deletions(-) delete mode 100644 drivers/mtd/spi/eeprom_m95xxx.c

2 1

[U-Boot] [GIT PULL] Zynq changes
by Michal Simek 19 Nov '15

19 Nov '15

Hi Tom, please pull these changes to your tree. Network patches have been Ack by Joe. mkimage, mii patches were reviewed by you. There is one problem with U-Boot SPL for Zynq because one patch break it (not compilation) "board_init: Change the logic to setup malloc_base" (sha1: 9ac4fc82071ce346e3885118242ff45d22f69b82) There is also one compilation warning from gem driver. I will send the patch to fix it. Thanks, Michal The following changes since commit 736d1746fb7b8f7cd70657a4a72db2b6bd8de40e: itest: add missing break statements to evalexp() (2015-11-18 15:29:00 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git zynq for you to fetch changes up to bdaeb8f23c6d5d11829072baaf0c0fe37c09f26a: common: mii: Do not allow to exceed max phy limit (2015-11-19 14:03:05 +0100) ---------------------------------------------------------------- Edgar E. Iglesias (2): net: phy: Add support for Texas Instruments DP83867 net: zynq: Disable secondary queues Michal Simek (17): zynqmp: mp: Add support for booting R5 from any address ARM: zynq: Choose boot image based on OF_SEPARATE macro ARM64: zynqmp: Enable TI phy by default net: zynq: Add debug message to phyread/phywrite net: zynq: Add support for different PHY interface types net: zynq: Extend register description with offsets net: zynq: Fix clearing statistic net: zynq: Allocate BD_SPACE in connection to RX_BUF net: zynq: Setup BD when structures are filled net: zynq: Do not report TX underrun net: zynq: Add dummy packet to fix packet duplication issue net: zynq: Wait till packet is sent net: zynq: Fix mdc clock division setting for 100Mbit/s net: zynq: Remove unused MDCCLKDIV2 macro net: zynq: Fix MDC setting for zynq zynq: sdhci: Define max clock by macro common: mii: Do not allow to exceed max phy limit Nathan Rossi (2): tools: zynqimage: Add Xilinx Zynq boot header generation to mkimage ARM: zynq: Add target for building bootable SPL image for Zynq Makefile | 3 +++ arch/arm/cpu/armv8/zynqmp/mp.c | 38 ++++++++++++++++++++++++++--- common/cmd_mii.c | 5 ++++ common/image.c | 1 + drivers/mmc/zynq_sdhci.c | 2 +- drivers/net/phy/Makefile | 1 + drivers/net/phy/phy.c | 3 +++ drivers/net/phy/ti.c | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/zynq_gem.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------- include/configs/xilinx_zynqmp.h | 4 +++ include/configs/xilinx_zynqmp_ep.h | 1 + include/configs/zynq-common.h | 3 ++- include/image.h | 3 ++- include/phy.h | 1 + scripts/Makefile.spl | 11 +++++++++ tools/Makefile | 1 + tools/zynqimage.c | 257 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 17 files changed, 638 insertions(+), 39 deletions(-) create mode 100644 drivers/net/phy/ti.c create mode 100644 tools/zynqimage.c -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform

2 1

[U-Boot] [GIT PULL] Microblaze changes
by Michal Simek 19 Nov '15

19 Nov '15

Hi, please pull these patches to your tree. I have added there 3 dm patches which were Acked-by Simon which fixing manual relocation which is used by Microblaze (others are probably without DM now). Thanks, Michal The following changes since commit 736d1746fb7b8f7cd70657a4a72db2b6bd8de40e: itest: add missing break statements to evalexp() (2015-11-18 15:29:00 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git master for you to fetch changes up to 2588f2ddfd60ac617c05def14e9a92fd329721fe: dm: sf: Add support for all targets which requires MANUAL_RELOC (2015-11-19 13:10:32 +0100) ---------------------------------------------------------------- Michal Simek (3): dm: spi: Add support for all targets which requires MANUAL_RELOC dm: core: Add missing entries for manual relocation dm: sf: Add support for all targets which requires MANUAL_RELOC Nathan Rossi (2): microblaze: Fix style issues in header files microblaze: Fix C99/gnu99 compatiblity for inline functions arch/microblaze/include/asm/bitops.h | 63 +++++++++++++++++++++------------------------------------------ arch/microblaze/include/asm/system.h | 2 +- drivers/core/root.c | 8 ++++++++ drivers/mtd/spi/sf-uclass.c | 23 +++++++++++++++++++++++ drivers/spi/spi-uclass.c | 20 ++++++++++++++++++++ 5 files changed, 73 insertions(+), 43 deletions(-) -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform

2 1

[U-Boot] Pull request: u-boot-ubi/master
by Heiko Schocher 19 Nov '15

19 Nov '15

Hello Tom, please pull from u-boot-ubi master The following changes since commit 736d1746fb7b8f7cd70657a4a72db2b6bd8de40e: itest: add missing break statements to evalexp() (2015-11-18 15:29:00 -0500) are available in the git repository at: git://git.denx.de/u-boot-ubi.git master for you to fetch changes up to a7c06cd3a6c2c889bd115f43f3de0c9fcc066f96: env_ubi.c: Correct pointer error in env load (2015-11-19 07:32:49 +0100) ---------------------------------------------------------------- Kevin Smith (1): env_ubi.c: Correct pointer error in env load common/env_ubi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [PATCH 1/2] ls102x: add soc version function
by Shengzhou Liu 19 Nov '15

19 Nov '15

Add get_svr_ver_major() and get_svr_ver_minor() helper. Signed-off-by: Shengzhou Liu <Shengzhou.Liu(a)freescale.com> --- arch/arm/cpu/armv7/ls102xa/cpu.c | 14 ++++++++++++++ arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 3 +++ 2 files changed, 17 insertions(+) diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index 14ae2a3..9253ea3 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -209,6 +209,20 @@ void enable_caches(void) } #endif /* #ifndef CONFIG_SYS_DCACHE_OFF */ +u32 get_svr_ver_major(void) +{ + struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); + + return SVR_MAJ(in_be32(&gur->svr)); +} + +u32 get_svr_ver_minor(void) +{ + struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); + + return SVR_MIN(in_be32(&gur->svr)); +} + #if defined(CONFIG_DISPLAY_CPUINFO) int print_cpuinfo(void) { diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h index c59c93a..4a996b8 100644 --- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h +++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h @@ -427,4 +427,7 @@ struct ccsr_ahci { u32 pberr; /* port 0/1 BIST error */ u32 cmds; /* port 0/1 CMD status error */ }; + +u32 get_svr_ver_major(void); +u32 get_svr_ver_minor(void); #endif /* __ASM_ARCH_LS102XA_IMMAP_H_ */ -- 2.1.0.27.g96db324

2 2

[U-Boot] [RESEND PATCH v5 1/6] cgtqmx6eval: Add SPI NOR flash support
by Otavio Salvador 19 Nov '15

19 Nov '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> --- Changes in v5: None Changes in v4: None 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

4 13