September 2015 - U-Boot

[U-Boot] Disabling/Enabling the Data Cache
by Fabio Estevam 24 Nov '15

24 Nov '15

Hi, On a mx6q (armv7) board when I disable and enable the Data Cache the following issue is observed: => dcache Data (writethrough) Cache is ON => dcache off => dcache on data abort pc : [<4ff3d340>] lr : [<4ff3b598>] reloc pc : [<17802340>] lr : [<17800598>] sp : 4f538d50 ip : 00000000 fp : 4f841188 r10: 4ffa4fd4 r9 : 4f538eb0 r8 : 00000002 r7 : 4f539de8 r6 : 00000000 r5 : 00000000 r4 : 00000000 r3 : 00a02000 r2 : 32450000 r1 : 4ff94732 r0 : 00000001 Flags: nZCv IRQs off FIQs off Mode SVC_32 Resetting CPU ... resetting ... U-Boot 2015.10-rc3-24232-g324714b-dirty (Sep 22 2015 - 15:08:16 -0300) CPU: Freescale i.MX6DL rev1.1 996 MHz (running at 792 MHz) Does anyone have any ideas about this? Thanks, Fabio Estevam

3 4

[U-Boot] [PATCH] common: add CMD_GPIO to Kconfig
by Thomas Chou 18 Nov '15

18 Nov '15

Add CMD_GPIO to Kconfig. Signed-off-by: Thomas Chou <thomas(a)wytron.com.tw> --- common/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/Kconfig b/common/Kconfig index 2c42b8e..f2034c2 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -344,6 +344,11 @@ config CMD_FPGA help FPGA support. +config CMD_GPIO + bool "gpio" + help + GPIO support. + endmenu -- 2.1.4

4 8

[U-Boot] [PATCH v2] board/BuR/kwb: use bootvx(...) (with bootline feature) instead go(...)
by Hannes Schmelzer 13 Nov '15

13 Nov '15

Since we don't have for sure a valid IP-setup during board_late_init(...) because it maybe allready stored in environment or not, we cannot form a proper vxWorks bootline at this place. So we move to the way, forming the bootline just before executing/launching vxWorks. To do this we use the bootvx command instead go. We only have to form the "othbootargs" environment variable, the rest is done pretty good by the "bootvx" commannd. Signed-off-by: Hannes Schmelzer <oe5hpm(a)oevsv.at> -- --- Changes in v2: - form only othbootargs instead whole bootline within board-code - depends now on Bin Mengs changes belong CMD_ELF http://patchwork.ozlabs.org/patch/523289/ - adapt kwb_defconfig to the new Kconfig defaults - use bootvx ... instead go ... to launch vxWorks kernel board/BuR/kwb/board.c | 27 +++++++++------------------ configs/kwb_defconfig | 3 +++ include/configs/kwb.h | 8 +++++--- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/board/BuR/kwb/board.c b/board/BuR/kwb/board.c index 039ec20..ad74ff2 100644 --- a/board/BuR/kwb/board.c +++ b/board/BuR/kwb/board.c @@ -47,10 +47,6 @@ #define RSTCTRL_FORCE_PWR_NEN 0x0404 #define RSTCTRL_CAN_STB 0x4040 -#define VXWORKS_BOOTLINE 0x80001100 -#define DEFAULT_BOOTLINE "cpsw(0,0):pme/vxWorks" -#define VXWORKS_USER "u=vxWorksFTP pw=vxWorks tn=vxtarget" - DECLARE_GLOBAL_DATA_PTR; #if defined(CONFIG_SPL_BUILD) @@ -281,20 +277,15 @@ int board_late_init(void) } else { puts("ERROR: i2c_set_bus_speed failed! (scratchregister)\n"); } - /* setup vxworks bootline */ - char *vxworksbootline = (char *)VXWORKS_BOOTLINE; - sprintf(vxworksbootline, - "%s h=%s e=%s:%s g=%s %s o=0x%08x;0x%08x;0x%08x;0x%08x", - DEFAULT_BOOTLINE, - getenv("serverip"), - getenv("ipaddr"), getenv("netmask"), - getenv("gatewayip"), - VXWORKS_USER, - (unsigned int) gd->fb_base-0x20, - (u32)getenv_ulong("vx_memtop", 16, gd->fb_base-0x20), - (u32)getenv_ulong("vx_romfsbase", 16, 0), - (u32)getenv_ulong("vx_romfssize", 16, 0)); - + /* setup othbootargs for bootvx-command (vxWorks bootline) */ + char othbootargs[128]; + snprintf(othbootargs, sizeof(othbootargs), + "u=vxWorksFTP pw=vxWorks o=0x%08x;0x%08x;0x%08x;0x%08x", + (unsigned int) gd->fb_base-0x20, + (u32)getenv_ulong("vx_memtop", 16, gd->fb_base-0x20), + (u32)getenv_ulong("vx_romfsbase", 16, 0), + (u32)getenv_ulong("vx_romfssize", 16, 0)); + setenv("othbootargs", othbootargs); /* * reset VBAR registers to its reset location, VxWorks 6.9.3.2 does * expect that vectors are there, original u-boot moves them to _start diff --git a/configs/kwb_defconfig b/configs/kwb_defconfig index f82fcf3..0bbe0a7 100644 --- a/configs/kwb_defconfig +++ b/configs/kwb_defconfig @@ -3,6 +3,9 @@ CONFIG_TARGET_KWB=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1" CONFIG_SYS_PROMPT="U-Boot (BuR V2.0)# " +# CONFIG_CMD_BOOTD is not set +# CONFIG_CMD_BOOTM is not set +# CONFIG_CMD_GO is not set # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set diff --git a/include/configs/kwb.h b/include/configs/kwb.h index 96f2e9d..45253b8 100644 --- a/include/configs/kwb.h +++ b/include/configs/kwb.h @@ -57,6 +57,8 @@ #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ +"bootaddr=0x80001100\0" \ +"bootdev=cpsw(0,0)\0" \ "vx_romfsbase=0x800E0000\0" \ "vx_romfssize=0x20000\0" \ "vx_memtop=0x8FBEF000\0" \ @@ -66,7 +68,7 @@ BUR_COMMON_ENV \ "logoaddr=0x82000000\0" \ "defaultARlen=0x8000\0" \ "loaddefaultAR=mmc read ${loadaddr} 800 ${defaultARlen}\0" \ -"defaultAR=run loadromfs; run loaddefaultAR; go ${loadaddr}\0" \ +"defaultAR=run loadromfs; run loaddefaultAR; bootvx ${loadaddr}\0" \ "logo0=fatload mmc 0:1 ${logoaddr} SYSTEM/ADDON/Bootlogo/Bootlogo.bmp.gz && " \ "bmp display ${logoaddr} 0 0\0" \ "logo1=fatload mmc 0:1 ${logoaddr} SYSTEM/BASE/Bootlogo/Bootlogo.bmp.gz && " \ @@ -74,11 +76,11 @@ BUR_COMMON_ENV \ "mmcboot=echo booting AR from eMMC-flash ...; "\ "run logo0 || run logo1; " \ "run loadromfs; " \ - "fatload mmc 0:1 ${loadaddr} arimg && go ${loadaddr}; " \ + "fatload mmc 0:1 ${loadaddr} arimg && bootvx ${loadaddr}; " \ "run defaultAR;\0" \ "netboot=echo booting AR from network ...; " \ "run loadromfs; " \ - "tftp ${loadaddr} arimg && go ${loadaddr}; " \ + "tftp ${loadaddr} arimg && bootvx ${loadaddr}; " \ "puts 'networkboot failed!';\0" \ "netscript=echo running script from network (tftp) ...; " \ "tftp 0x80000000 netscript.img && source; " \ -- 1.9.1

3 2

[U-Boot] [PATCH v4 00/33] dm: Introduce Rockchip RK3288 support
by Simon Glass 10 Nov '15

10 Nov '15

The Rockchip RK3288 is based on a quad-core Cortex-A17 CPU and has a good set of peripherals. Various full-featured U-Boot ports are available and this is an attempt to bring those features into mainline. With this series the Firefly RK3288 can boot to a prompt from an SD card. Since much of the code is generic, this also supports the Radxa Rock 2. Since there is no device tree available for that yet, it uses the same config and device tree as the Firefly. This works because not all peripherals are supported, so the differences don't matter. Support for booting from USB OTG is also provided, using the on-chip boot ROM and the rkflashtool utility. This can boot as far as SPL, but there is no support for reading U-Boot proper from USB as yet. This requires implementing a suitable protocol (perhaps DFU or Rockchip's proprietary one) in SPL. Support is also provided for the Hisense Chromebook, which is based on the same SoC. In this case it boots from SPI rather than an SD card. This seriea makes use of driver model including a number of recently added uclasses: - Clocks - setting and getting PLL and peripheral clocks - Pinctrl - adjusting pin multiplexing settings - Reset - reseting the board or SoC - RAM - setting up RAM controllers and detecting the available RAM - MMC - MMC controllers (using the existing block device framework) - LEDs - turning LEDs on and off, with only a GPIO driver so far This series avoids hard-coding RK3288-specific code into the build. There is a CONFIG_ROCKCHIP_RK3288 but it only *adds* support for RK3288. In principle another CONFIG could add support for a different Rockchip SoC with only the device tree selecting which one U-Boot works on. Support is provided in mkimage to build these image types: - rkimage - suitable for packaging up SPL to be sent to the boot ROM over USB OTG - rksd - suitable for writing to an SD card Much of the source and ideas for this series came from downstream Rockchip U-Boot trees. SDRAM init came from Coreboot. In most cases it has been pretty heavily cleaned up / rewritten to meet U-Boot style and remove hard-coding of things. Drivers are provided for: - Clocks - Pinctrl - SoC reset - DDR3 SDRAM - I2C - SPI - GPIOs - LEDs using GPIOS - MMC - Firefly main PMIC (ACT8846) and included regulators These are lightly tested and doubtless some problems exist with some, particularly I2C. One problem with device tree is that U-Boot has no way of dropping features it does not need or use. For SPL this problem needs to be solved and this series uses a new 'fdtgrep' tool for this. The 45KB Firefly device tree reduces to a 6KB bytes when unused material is removed. SDRAM timings are also in the device tree. There is a large amount of additional work to bring other Rockchip drivers and features into mainline U-Boot, so this is only a start. Note: This series sits on top of Masahiro's RFC pinctrl series. I wanted to get a new version out while we wait for this to make it to mainline. You can find this series at u-boot-dm/rockchip-working. Changes in v4: - Add a set_state_simple() method - Adjust the defconfig file to suit mainline - Rename pinctrl.h to dm/pinctrl.h - Tweak the cover letter a little, drop mention of patches already applied - Use CONFIG_SPL_LED instead of CONFIG_SPL_LED_SUPPORT Changes in v3: - Add device tree bindings for CRU and DMC - Add various new patches to get RK3288 booting to a prompt - Make use of additional features since version 2 - Update README to mention available drivers - Update clock rate to always be 24MHz Changes in v2: - Drop use of CONFIG_USE_PRIVATE_LIBGCC=y - Tidy up license headers and remove SPL #ifdefs Masahiro Yamada (1): dm: do not return pointer if NULL is given to devp of device_bind() Simon Glass (32): pinctrl: Correct build errors in the pinctrl_simple pinctrl: Add help text to Kconfig pinctrl: Add the concept of peripheral IDs mmc: Support bypass mode with the get_mmc_clk() method dm: Improve handling of a missing uclass dm: Provide better debugging when a device fails to bind arm: reset: Avoid a build error when the reset uclass is enabled rockchip: Add serial support rockchip: Bring in RK3288 device tree file includes and bindings rockchip: rk3288: dts: Make core devices available early mkimage: Allow padding to any length mkimage: Allow the original file size to be recorded rockchip: Add the rkimage format to mkimage rockchip: Add support for the SD image rockchip: Add support for the SPI image rockchip: gpio: Add rockchip GPIO driver rockchip: Add basic peripheral and clock definitions power: Add support for ACT8846 PMIC power: regulator: Add a driver for ACT8846 regulators rockchip: rk3288: Add clock driver rockchip: rk3288: Add header files for PMU and GRF rockchip: rk3288: Add SoC reset driver rockchip: rk3288: Add a simple syscon driver rockchip: rk3288: Add pinctrl driver rockchip: rk3288: Add SDRAM init rockchip: Add an MMC driver rockchip: Add core SoC start-up code rockchip: Add I2C driver rockchip: Add SPI driver rockchip: Add basic support for firefly-rk3288 rockchip: Add basic support for jerry rockchip: Add a simple README arch/arm/Kconfig | 10 + arch/arm/Makefile | 1 + arch/arm/dts/Makefile | 3 + arch/arm/dts/cros-ec-sbs.dtsi | 16 + arch/arm/dts/rk3288-firefly.dts | 75 + arch/arm/dts/rk3288-firefly.dtsi | 457 ++++++ arch/arm/dts/rk3288-jerry.dts | 203 +++ arch/arm/dts/rk3288-thermal.dtsi | 88 ++ arch/arm/dts/rk3288-veyron-chromebook.dtsi | 200 +++ arch/arm/dts/rk3288-veyron.dtsi | 844 +++++++++++ arch/arm/dts/rk3288.dtsi | 1473 ++++++++++++++++++++ arch/arm/include/asm/arch-rockchip/clock.h | 45 + arch/arm/include/asm/arch-rockchip/cru_rk3288.h | 185 +++ arch/arm/include/asm/arch-rockchip/ddr_rk3288.h | 484 +++++++ arch/arm/include/asm/arch-rockchip/gpio.h | 28 + arch/arm/include/asm/arch-rockchip/grf_rk3288.h | 768 ++++++++++ arch/arm/include/asm/arch-rockchip/hardware.h | 20 + arch/arm/include/asm/arch-rockchip/i2c.h | 70 + arch/arm/include/asm/arch-rockchip/periph.h | 54 + arch/arm/include/asm/arch-rockchip/pmu_rk3288.h | 89 ++ arch/arm/include/asm/arch-rockchip/sdram.h | 92 ++ arch/arm/lib/Makefile | 2 + arch/arm/mach-rockchip/Kconfig | 41 + arch/arm/mach-rockchip/Makefile | 13 + arch/arm/mach-rockchip/board-spl.c | 290 ++++ arch/arm/mach-rockchip/board.c | 46 + arch/arm/mach-rockchip/common.c | 28 + arch/arm/mach-rockchip/rk3288/Kconfig | 26 + arch/arm/mach-rockchip/rk3288/Makefile | 9 + arch/arm/mach-rockchip/rk3288/reset_rk3288.c | 47 + arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 878 ++++++++++++ arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 25 + board/firefly/firefly-rk3288/Kconfig | 15 + board/firefly/firefly-rk3288/MAINTAINERS | 6 + board/firefly/firefly-rk3288/Makefile | 7 + board/firefly/firefly-rk3288/firefly-rk3288.c | 7 + board/google/chromebook_jerry/Kconfig | 15 + board/google/chromebook_jerry/MAINTAINERS | 6 + board/google/chromebook_jerry/Makefile | 7 + board/google/chromebook_jerry/jerry.c | 7 + board/google/common/Makefile | 2 +- common/image.c | 3 + configs/chromebook_jerry_defconfig | 43 + configs/firefly-rk3288_defconfig | 43 + doc/README.rockchip | 246 ++++ .../clock/rockchip,rk3188-cru.txt | 61 + .../clock/rockchip,rk3288-cru.txt | 61 + .../clock/rockchip,rk3288-dmc.txt | 155 ++ doc/device-tree-bindings/clock/rockchip.txt | 77 + .../pinctrl/rockchip,pinctrl.txt | 157 +++ .../thermal/rockchip-thermal.txt | 68 + drivers/clk/Makefile | 1 + drivers/clk/clk_rk3288.c | 618 ++++++++ drivers/core/device.c | 10 +- drivers/core/root.c | 5 +- drivers/core/uclass.c | 7 +- drivers/gpio/Kconfig | 9 + drivers/gpio/Makefile | 1 + drivers/gpio/rk_gpio.c | 123 ++ drivers/i2c/Kconfig | 9 + drivers/i2c/Makefile | 1 + drivers/i2c/rk_i2c.c | 391 ++++++ drivers/mmc/Kconfig | 9 + drivers/mmc/Makefile | 1 + drivers/mmc/dw_mmc.c | 2 +- drivers/mmc/exynos_dw_mmc.c | 2 +- drivers/mmc/rockchip_mmc.c | 98 ++ drivers/pinctrl/Kconfig | 22 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl-uclass.c | 41 +- drivers/pinctrl/rockchip/Makefile | 8 + drivers/pinctrl/rockchip/pinctrl_rk3288.c | 441 ++++++ drivers/power/pmic/Kconfig | 9 + drivers/power/pmic/Makefile | 1 + drivers/power/pmic/act8846.c | 90 ++ drivers/power/regulator/Kconfig | 9 + drivers/power/regulator/Makefile | 1 + drivers/power/regulator/act8846.c | 155 ++ drivers/serial/Kconfig | 9 + drivers/serial/Makefile | 1 + drivers/serial/serial_rockchip.c | 43 + drivers/spi/Kconfig | 9 + drivers/spi/Makefile | 1 + drivers/spi/rk_spi.c | 375 +++++ drivers/spi/rk_spi.h | 121 ++ include/configs/chromebook_jerry.h | 16 + include/configs/firefly-rk3288.h | 15 + include/configs/rk3288_common.h | 98 ++ include/dm/pinctrl.h | 61 + include/dt-bindings/clock/rk3288-cru.h | 370 +++++ include/dt-bindings/clock/rockchip,rk808.h | 11 + include/dt-bindings/pinctrl/rockchip.h | 26 + include/dt-bindings/power-domain/rk3288.h | 11 + include/dwmmc.h | 16 +- include/image.h | 5 +- include/power/act8846_pmic.h | 37 + tools/Makefile | 3 + tools/imagetool.h | 1 + tools/mkimage.c | 23 +- tools/rkcommon.c | 72 + tools/rkcommon.h | 28 + tools/rkimage.c | 65 + tools/rksd.c | 102 ++ tools/rkspi.c | 119 ++ 104 files changed, 11274 insertions(+), 25 deletions(-) create mode 100644 arch/arm/dts/cros-ec-sbs.dtsi create mode 100644 arch/arm/dts/rk3288-firefly.dts create mode 100644 arch/arm/dts/rk3288-firefly.dtsi create mode 100644 arch/arm/dts/rk3288-jerry.dts create mode 100644 arch/arm/dts/rk3288-thermal.dtsi create mode 100644 arch/arm/dts/rk3288-veyron-chromebook.dtsi create mode 100644 arch/arm/dts/rk3288-veyron.dtsi create mode 100644 arch/arm/dts/rk3288.dtsi create mode 100644 arch/arm/include/asm/arch-rockchip/clock.h create mode 100644 arch/arm/include/asm/arch-rockchip/cru_rk3288.h create mode 100644 arch/arm/include/asm/arch-rockchip/ddr_rk3288.h create mode 100644 arch/arm/include/asm/arch-rockchip/gpio.h create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3288.h create mode 100644 arch/arm/include/asm/arch-rockchip/hardware.h create mode 100644 arch/arm/include/asm/arch-rockchip/i2c.h create mode 100644 arch/arm/include/asm/arch-rockchip/periph.h create mode 100644 arch/arm/include/asm/arch-rockchip/pmu_rk3288.h create mode 100644 arch/arm/include/asm/arch-rockchip/sdram.h create mode 100644 arch/arm/mach-rockchip/Kconfig create mode 100644 arch/arm/mach-rockchip/Makefile create mode 100644 arch/arm/mach-rockchip/board-spl.c create mode 100644 arch/arm/mach-rockchip/board.c create mode 100644 arch/arm/mach-rockchip/common.c create mode 100644 arch/arm/mach-rockchip/rk3288/Kconfig create mode 100644 arch/arm/mach-rockchip/rk3288/Makefile create mode 100644 arch/arm/mach-rockchip/rk3288/reset_rk3288.c create mode 100644 arch/arm/mach-rockchip/rk3288/sdram_rk3288.c create mode 100644 arch/arm/mach-rockchip/rk3288/syscon_rk3288.c create mode 100644 board/firefly/firefly-rk3288/Kconfig create mode 100644 board/firefly/firefly-rk3288/MAINTAINERS create mode 100644 board/firefly/firefly-rk3288/Makefile create mode 100644 board/firefly/firefly-rk3288/firefly-rk3288.c create mode 100644 board/google/chromebook_jerry/Kconfig create mode 100644 board/google/chromebook_jerry/MAINTAINERS create mode 100644 board/google/chromebook_jerry/Makefile create mode 100644 board/google/chromebook_jerry/jerry.c create mode 100644 configs/chromebook_jerry_defconfig create mode 100644 configs/firefly-rk3288_defconfig create mode 100644 doc/README.rockchip create mode 100644 doc/device-tree-bindings/clock/rockchip,rk3188-cru.txt create mode 100644 doc/device-tree-bindings/clock/rockchip,rk3288-cru.txt create mode 100644 doc/device-tree-bindings/clock/rockchip,rk3288-dmc.txt create mode 100644 doc/device-tree-bindings/clock/rockchip.txt create mode 100644 doc/device-tree-bindings/pinctrl/rockchip,pinctrl.txt create mode 100644 doc/device-tree-bindings/thermal/rockchip-thermal.txt create mode 100644 drivers/clk/clk_rk3288.c create mode 100644 drivers/gpio/rk_gpio.c create mode 100644 drivers/i2c/rk_i2c.c create mode 100644 drivers/mmc/rockchip_mmc.c create mode 100644 drivers/pinctrl/rockchip/Makefile create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3288.c create mode 100644 drivers/power/pmic/act8846.c create mode 100644 drivers/power/regulator/act8846.c create mode 100644 drivers/serial/serial_rockchip.c create mode 100644 drivers/spi/rk_spi.c create mode 100644 drivers/spi/rk_spi.h create mode 100644 include/configs/chromebook_jerry.h create mode 100644 include/configs/firefly-rk3288.h create mode 100644 include/configs/rk3288_common.h create mode 100644 include/dt-bindings/clock/rk3288-cru.h create mode 100644 include/dt-bindings/clock/rockchip,rk808.h create mode 100644 include/dt-bindings/pinctrl/rockchip.h create mode 100644 include/dt-bindings/power-domain/rk3288.h create mode 100644 include/power/act8846_pmic.h create mode 100644 tools/rkcommon.c create mode 100644 tools/rkcommon.h create mode 100644 tools/rkimage.c create mode 100644 tools/rksd.c create mode 100644 tools/rkspi.c -- 2.5.0.457.gab17608

8 57

[U-Boot] [RFC][PATCH 00/25] eeprom: Cleanup and support for multiple i2c busses
by Marek Vasut 10 Nov '15

10 Nov '15

This patch series first zaps a couple of ancient boards and ugly code which was in the way of proper cleanup for the eeprom command. Once that is done, the eeprom command undergoes proper cleaning. Finally, there is one patch which adds support for selecting on which bus the I2C EEPROM is. This functionality seems to be in high demand, which is exactly the reason why some boards decided to implement this themselves :-( This series makes U-Boot also less IoT, since it removes all the nice PHP, CSS and SQL stuff from it ;-) Marek Vasut (25): ppc: Zap ICU862 board ppc: Zap MHPC board ppc: Zap Hymod board ppc: Zap HWW1U1A board ppc: Zap IDS8247 board ppc: Zap TQM8260 board ppc: Zap TQM8272 board arm: Zap tricorder-eeprom eeprom: Shuffle code around eeprom: Zap CONFIG_SYS_I2C_MULTI_EEPROMS eeprom: Zap CONFIG_SYS_EEPROM_X40430 eeprom: Zap eeprom_probe() eeprom: Zap CONFIG_SPI_X eeprom: Pull out the I/O code eeprom: Pull out address computation eeprom: Make eeprom_write_enable() weak eeprom: Pull out CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS eeprom: Suck the ifdef into eeprom_init() eeprom: Pull out CONFIG_SYS_EEPROM_PAGE_WRITE_BITS eeprom: Pull out transfer length computation eeprom: Pull out the RW loop eeprom: Cultivate the ifdef mess eeprom: Add bus argument to eeprom_init() eeprom: Add support for selecting i2c bus eeprom: Clean up checkpatch issues README | 5 - arch/powerpc/cpu/mpc8260/Kconfig | 16 - arch/powerpc/cpu/mpc8260/ether_fcc.c | 27 +- arch/powerpc/cpu/mpc8260/interrupts.c | 10 +- arch/powerpc/cpu/mpc8260/pci.c | 2 - arch/powerpc/cpu/mpc8260/start.S | 14 - arch/powerpc/cpu/mpc83xx/start.S | 11 - arch/powerpc/cpu/mpc85xx/Kconfig | 4 - arch/powerpc/cpu/mpc8xx/Kconfig | 8 - arch/powerpc/cpu/mpc8xx/cpu_init.c | 2 - arch/powerpc/cpu/mpc8xx/fec.c | 40 +- arch/powerpc/include/asm/u-boot.h | 3 - board/corscience/tricorder/Makefile | 2 +- board/corscience/tricorder/tricorder-eeprom.c | 251 ------- board/corscience/tricorder/tricorder-eeprom.h | 41 -- board/eltec/mhpc/Kconfig | 12 - board/eltec/mhpc/MAINTAINERS | 6 - board/eltec/mhpc/Makefile | 8 - board/eltec/mhpc/flash.c | 414 ----------- board/eltec/mhpc/mhpc.c | 465 ------------- board/eltec/mhpc/u-boot.lds.debug | 121 ---- board/exmeritus/hww1u1a/Kconfig | 12 - board/exmeritus/hww1u1a/MAINTAINERS | 6 - board/exmeritus/hww1u1a/Makefile | 12 - board/exmeritus/hww1u1a/ddr.c | 34 - board/exmeritus/hww1u1a/gpios.h | 56 -- board/exmeritus/hww1u1a/hww1u1a.c | 268 -------- board/exmeritus/hww1u1a/law.c | 18 - board/exmeritus/hww1u1a/tlb.c | 90 --- board/hymod/Kconfig | 9 - board/hymod/MAINTAINERS | 6 - board/hymod/Makefile | 8 - board/hymod/bsp.c | 387 ----------- board/hymod/config.mk | 14 - board/hymod/eeprom.c | 678 ------------------ board/hymod/env.c | 221 ------ board/hymod/fetch.c | 91 --- board/hymod/flash.c | 490 ------------- board/hymod/flash.h | 140 ---- board/hymod/global_env | 145 ---- board/hymod/hymod.c | 521 -------------- board/hymod/hymod.h | 305 --------- board/hymod/input.c | 91 --- board/hymod/u-boot.lds | 132 ---- board/hymod/u-boot.lds.debug | 121 ---- board/icu862/Kconfig | 9 - board/icu862/MAINTAINERS | 7 - board/icu862/Makefile | 8 - board/icu862/flash.c | 575 ---------------- board/icu862/icu862.c | 199 ------ board/icu862/pcmcia.c | 262 ------- board/icu862/u-boot.lds | 82 --- board/icu862/u-boot.lds.debug | 122 ---- board/ids/ids8247/Kconfig | 12 - board/ids/ids8247/MAINTAINERS | 6 - board/ids/ids8247/Makefile | 11 - board/ids/ids8247/ids8247.c | 390 ----------- board/tqc/tqm8260/Kconfig | 12 - board/tqc/tqm8260/MAINTAINERS | 16 - board/tqc/tqm8260/Makefile | 8 - board/tqc/tqm8260/README | 415 ----------- board/tqc/tqm8260/tqm8260.c | 352 ---------- board/tqc/tqm8272/Kconfig | 12 - board/tqc/tqm8272/MAINTAINERS | 6 - board/tqc/tqm8272/Makefile | 8 - board/tqc/tqm8272/nand.c | 264 ------- board/tqc/tqm8272/tqm8272.c | 944 -------------------------- board/tqc/tqm8272/tqm8272.h | 37 - common/cmd_eeprom.c | 501 +++++--------- common/env_eeprom.c | 4 +- configs/HWW1U1A_defconfig | 3 - configs/ICU862_100MHz_defconfig | 4 - configs/ICU862_defconfig | 3 - configs/IDS8247_defconfig | 3 - configs/MHPC_defconfig | 3 - configs/TQM8255_AA_defconfig | 4 - configs/TQM8260_AA_defconfig | 4 - configs/TQM8260_AB_defconfig | 4 - configs/TQM8260_AC_defconfig | 4 - configs/TQM8260_AD_defconfig | 4 - configs/TQM8260_AE_defconfig | 4 - configs/TQM8260_AF_defconfig | 4 - configs/TQM8260_AG_defconfig | 4 - configs/TQM8260_AH_defconfig | 4 - configs/TQM8260_AI_defconfig | 4 - configs/TQM8265_AA_defconfig | 4 - configs/TQM8272_defconfig | 3 - configs/hymod_defconfig | 3 - include/asm-generic/u-boot.h | 3 - include/common.h | 8 +- include/commproc.h | 32 - include/configs/BSC9131RDB.h | 1 - include/configs/BSC9132QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/CPCI405AB.h | 1 - include/configs/CPCI750.h | 1 - include/configs/DB64360.h | 1 - include/configs/DB64460.h | 1 - include/configs/DU440.h | 1 - include/configs/HWW1U1A.h | 460 ------------- include/configs/ICU862.h | 443 ------------ include/configs/IDS8247.h | 462 ------------- include/configs/MHPC.h | 369 ---------- include/configs/P1010RDB.h | 1 - include/configs/PMC440.h | 1 - include/configs/TQM8260.h | 620 ----------------- include/configs/TQM8272.h | 735 -------------------- include/configs/TQM834x.h | 1 - include/configs/W7OLMC.h | 1 - include/configs/W7OLMG.h | 1 - include/configs/acadia.h | 1 - include/configs/am335x_evm.h | 1 - include/configs/am43xx_evm.h | 1 - include/configs/axs101.h | 1 - include/configs/bamboo.h | 1 - include/configs/canyonlands.h | 1 - include/configs/cpci5200.h | 1 - include/configs/ebony.h | 1 - include/configs/hymod.h | 728 -------------------- include/configs/icon.h | 1 - include/configs/intip.h | 1 - include/configs/katmai.h | 1 - include/configs/km/km-powerpc.h | 1 - include/configs/km/km_arm.h | 1 - include/configs/korat.h | 1 - include/configs/ks2_evm.h | 1 - include/configs/luan.h | 1 - include/configs/m28evk.h | 1 - include/configs/mecp5200.h | 1 - include/configs/motionpro.h | 1 - include/configs/ocotea.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/p1_twr.h | 1 - include/configs/pcm051.h | 1 - include/configs/pengwyn.h | 1 - include/configs/pf5200.h | 1 - include/configs/sequoia.h | 1 - include/configs/t3corp.h | 1 - include/configs/taishan.h | 1 - include/configs/tricorder.h | 1 - include/configs/walnut.h | 1 - include/configs/yosemite.h | 1 - include/pcmcia.h | 2 - include/status_led.h | 19 - tools/bddb/README | 116 ---- tools/bddb/badsubmit.php | 23 - tools/bddb/bddb.css | 207 ------ tools/bddb/brlog.php | 109 --- tools/bddb/browse.php | 147 ---- tools/bddb/config.php | 16 - tools/bddb/create_tables.sql | 90 --- tools/bddb/defs.php | 710 ------------------- tools/bddb/dodelete.php | 65 -- tools/bddb/dodellog.php | 57 -- tools/bddb/doedit.php | 186 ----- tools/bddb/doedlog.php | 76 --- tools/bddb/donew.php | 230 ------- tools/bddb/donewlog.php | 86 --- tools/bddb/edit.php | 131 ---- tools/bddb/edlog.php | 86 --- tools/bddb/execute.php | 33 - tools/bddb/index.php | 38 -- tools/bddb/new.php | 120 ---- tools/bddb/newlog.php | 54 -- 164 files changed, 174 insertions(+), 15976 deletions(-) delete mode 100644 board/corscience/tricorder/tricorder-eeprom.c delete mode 100644 board/corscience/tricorder/tricorder-eeprom.h delete mode 100644 board/eltec/mhpc/Kconfig delete mode 100644 board/eltec/mhpc/MAINTAINERS delete mode 100644 board/eltec/mhpc/Makefile delete mode 100644 board/eltec/mhpc/flash.c delete mode 100644 board/eltec/mhpc/mhpc.c delete mode 100644 board/eltec/mhpc/u-boot.lds.debug delete mode 100644 board/exmeritus/hww1u1a/Kconfig delete mode 100644 board/exmeritus/hww1u1a/MAINTAINERS delete mode 100644 board/exmeritus/hww1u1a/Makefile delete mode 100644 board/exmeritus/hww1u1a/ddr.c delete mode 100644 board/exmeritus/hww1u1a/gpios.h delete mode 100644 board/exmeritus/hww1u1a/hww1u1a.c delete mode 100644 board/exmeritus/hww1u1a/law.c delete mode 100644 board/exmeritus/hww1u1a/tlb.c delete mode 100644 board/hymod/Kconfig delete mode 100644 board/hymod/MAINTAINERS delete mode 100644 board/hymod/Makefile delete mode 100644 board/hymod/bsp.c delete mode 100644 board/hymod/config.mk delete mode 100644 board/hymod/eeprom.c delete mode 100644 board/hymod/env.c delete mode 100644 board/hymod/fetch.c delete mode 100644 board/hymod/flash.c delete mode 100644 board/hymod/flash.h delete mode 100644 board/hymod/global_env delete mode 100644 board/hymod/hymod.c delete mode 100644 board/hymod/hymod.h delete mode 100644 board/hymod/input.c delete mode 100644 board/hymod/u-boot.lds delete mode 100644 board/hymod/u-boot.lds.debug delete mode 100644 board/icu862/Kconfig delete mode 100644 board/icu862/MAINTAINERS delete mode 100644 board/icu862/Makefile delete mode 100644 board/icu862/flash.c delete mode 100644 board/icu862/icu862.c delete mode 100644 board/icu862/pcmcia.c delete mode 100644 board/icu862/u-boot.lds delete mode 100644 board/icu862/u-boot.lds.debug delete mode 100644 board/ids/ids8247/Kconfig delete mode 100644 board/ids/ids8247/MAINTAINERS delete mode 100644 board/ids/ids8247/Makefile delete mode 100644 board/ids/ids8247/ids8247.c delete mode 100644 board/tqc/tqm8260/Kconfig delete mode 100644 board/tqc/tqm8260/MAINTAINERS delete mode 100644 board/tqc/tqm8260/Makefile delete mode 100644 board/tqc/tqm8260/README delete mode 100644 board/tqc/tqm8260/tqm8260.c delete mode 100644 board/tqc/tqm8272/Kconfig delete mode 100644 board/tqc/tqm8272/MAINTAINERS delete mode 100644 board/tqc/tqm8272/Makefile delete mode 100644 board/tqc/tqm8272/nand.c delete mode 100644 board/tqc/tqm8272/tqm8272.c delete mode 100644 board/tqc/tqm8272/tqm8272.h delete mode 100644 configs/HWW1U1A_defconfig delete mode 100644 configs/ICU862_100MHz_defconfig delete mode 100644 configs/ICU862_defconfig delete mode 100644 configs/IDS8247_defconfig delete mode 100644 configs/MHPC_defconfig delete mode 100644 configs/TQM8255_AA_defconfig delete mode 100644 configs/TQM8260_AA_defconfig delete mode 100644 configs/TQM8260_AB_defconfig delete mode 100644 configs/TQM8260_AC_defconfig delete mode 100644 configs/TQM8260_AD_defconfig delete mode 100644 configs/TQM8260_AE_defconfig delete mode 100644 configs/TQM8260_AF_defconfig delete mode 100644 configs/TQM8260_AG_defconfig delete mode 100644 configs/TQM8260_AH_defconfig delete mode 100644 configs/TQM8260_AI_defconfig delete mode 100644 configs/TQM8265_AA_defconfig delete mode 100644 configs/TQM8272_defconfig delete mode 100644 configs/hymod_defconfig delete mode 100644 include/configs/HWW1U1A.h delete mode 100644 include/configs/ICU862.h delete mode 100644 include/configs/IDS8247.h delete mode 100644 include/configs/MHPC.h delete mode 100644 include/configs/TQM8260.h delete mode 100644 include/configs/TQM8272.h delete mode 100644 include/configs/hymod.h delete mode 100644 tools/bddb/README delete mode 100644 tools/bddb/badsubmit.php delete mode 100644 tools/bddb/bddb.css delete mode 100644 tools/bddb/brlog.php delete mode 100644 tools/bddb/browse.php delete mode 100644 tools/bddb/config.php delete mode 100644 tools/bddb/create_tables.sql delete mode 100644 tools/bddb/defs.php delete mode 100644 tools/bddb/dodelete.php delete mode 100644 tools/bddb/dodellog.php delete mode 100644 tools/bddb/doedit.php delete mode 100644 tools/bddb/doedlog.php delete mode 100644 tools/bddb/donew.php delete mode 100644 tools/bddb/donewlog.php delete mode 100644 tools/bddb/edit.php delete mode 100644 tools/bddb/edlog.php delete mode 100644 tools/bddb/execute.php delete mode 100644 tools/bddb/index.php delete mode 100644 tools/bddb/new.php delete mode 100644 tools/bddb/newlog.php Cc: Tom Rini <trini(a)ti.com> -- 2.1.1

4 36

[U-Boot] Using spi_alloc_slave() from SPL
by Fabio Estevam 10 Nov '15

10 Nov '15

Hi, I am trying to use spi_flash_probe() inside SPL on a custom mx6 board. The idea is to read some parameters from the SPI NOR flash and configure the DDR accordingly. This is similar to what gw_ventana_spl.c does, but it reads from i2c eeprom instead of SPI NOR. Here are the changes just to illustrate the problem: --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -692,6 +692,19 @@ int checkboard(void) #ifdef CONFIG_SPL_BUILD #include <spl.h> #include <libfdt.h> +#include <spi_flash.h> +#include <spi.h> + +static int read_spi_flash(void) +{ + struct spi_flash *spi; + char buf[2]; + + spi = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, + CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE); + return spi_flash_read(spi, 0, 2, buf); +} const struct mx6dq_iomux_ddr_regs mx6_ddr_ioregs = { .dram_sdclk_0 = 0x00020030, @@ -837,6 +850,8 @@ void board_init_f(ulong dummy) /* UART clocks enabled and gd valid - init serial console */ preloader_console_init(); + read_spi_flash(); + /* DDR initialization */ spl_dram_init(); diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 41162ca..f5dfaf7 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -12,6 +12,10 @@ #ifdef CONFIG_SPL #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_MMC_SUPPORT +#define CONFIG_SPL_SPI_SUPPORT +#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) +#define CONFIG_SPL_SPI_LOAD #include "imx6_spl.h" #endif @@ -35,6 +39,12 @@ #define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */ #endif +#define CONFIG_ENV_SECT_SIZE (64 * 1024) +#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS +#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS +#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE +#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED + #define CONFIG_CMD_PCI #ifdef CONFIG_CMD_PCI #define CONFIG_PCI -- 1.9.1 The when I run it: U-Boot SPL 2015.07-08202-g6dcdca1-dirty (Aug 06 2015 - 10:18:33) mxc_spi: SPI Slave not allocated ! spi_flash_probe() ---> spi_setup_slave() ----> spi_alloc_slave() which fails on mxc_spi.c As read_spi_flash() is called prior to the DDR initialization, spi_alloc_slave() fails. Is there a way to avoid calling spi_alloc_slave() in the SPL case? Any ideas on how to fix this? Thanks, Fabio Estevam

5 15

[U-Boot] [PATCH v3] common: Fix load and entry addresses in FIT image
by York Sun 06 Nov '15

06 Nov '15

FIT image supports more than 32 bits in addresses by using #address-cell field. However the address length is not handled when parsing FIT images. Beside, the variable used to host address has "ulong" type. It is OK for the target, but not always enough for host tools such as mkimage. This patch replaces "ulong" with "phys_addr_t" to make sure the address is correct for both the target and the host. Signed-off-by: York Sun <yorksun(a)freescale.com> --- Changes in v3: Define PRIpa for host and target in common/image-fit.c so printf works properly for 32-, 64-bit targets and host tools. Changes in v2: Make a common function for both load and entry addresses. Simplify calculation of addresses in a similar way as fdtdec_get_number() fdtdec_get_number() is not used, or too many files need to be included and/or twisted for host tool Continue to use %08llx for print format for load and entry addresses because %pa does not always work for host tool (mkimage) common/bootm.c | 13 +++++---- common/image-fit.c | 81 +++++++++++++++++++++++++++++----------------------- include/bootm.h | 6 ++-- include/image.h | 12 +++++--- 4 files changed, 63 insertions(+), 49 deletions(-) diff --git a/common/bootm.c b/common/bootm.c index 667c934..0672e73 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -325,9 +325,9 @@ static int handle_decomp_error(int comp_type, size_t uncomp_size, return BOOTM_ERR_RESET; } -int bootm_decomp_image(int comp, ulong load, ulong image_start, int type, - void *load_buf, void *image_buf, ulong image_len, - uint unc_len, ulong *load_end) +int bootm_decomp_image(int comp, phys_addr_t load, phys_addr_t image_start, + int type, void *load_buf, void *image_buf, + ulong image_len, uint unc_len, ulong *load_end) { int ret = 0; @@ -883,7 +883,8 @@ void memmove_wd(void *to, void *from, size_t len, ulong chunksz) static int bootm_host_load_image(const void *fit, int req_image_type) { const char *fit_uname_config = NULL; - ulong data, len; + phys_addr_t *data = NULL; + ulong len; bootm_headers_t images; int noffset; ulong load_end; @@ -897,7 +898,7 @@ static int bootm_host_load_image(const void *fit, int req_image_type) noffset = fit_image_load(&images, (ulong)fit, NULL, &fit_uname_config, IH_ARCH_DEFAULT, req_image_type, -1, - FIT_LOAD_IGNORED, &data, &len); + FIT_LOAD_IGNORED, data, &len); if (noffset < 0) return noffset; if (fit_image_get_type(fit, noffset, &image_type)) { @@ -912,7 +913,7 @@ static int bootm_host_load_image(const void *fit, int req_image_type) /* Allow the image to expand by a factor of 4, should be safe */ load_buf = malloc((1 << 20) + len * 4); - ret = bootm_decomp_image(imape_comp, 0, data, image_type, load_buf, + ret = bootm_decomp_image(imape_comp, 0, *data, image_type, load_buf, (void *)data, len, CONFIG_SYS_BOOTM_LEN, &load_end); free(load_buf); diff --git a/common/image-fit.c b/common/image-fit.c index 28f7aa8..2248692 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -13,12 +13,14 @@ #include "mkimage.h" #include <image.h> #include <time.h> +#define PRIpa "0x%08llx" #else #include <common.h> #include <errno.h> #include <mapmem.h> #include <asm/io.h> DECLARE_GLOBAL_DATA_PTR; +#define PRIpa "0x%08lx" #endif /* !USE_HOSTCC*/ #include <bootstage.h> @@ -358,7 +360,7 @@ void fit_image_print(const void *fit, int image_noffset, const char *p) char *desc; uint8_t type, arch, os, comp; size_t size; - ulong load, entry; + phys_addr_t load, entry; const void *data; int noffset; int ndepth; @@ -428,17 +430,17 @@ void fit_image_print(const void *fit, int image_noffset, const char *p) if (ret) printf("unavailable\n"); else - printf("0x%08lx\n", load); + printf(PRIpa "\n", load); } if ((type == IH_TYPE_KERNEL) || (type == IH_TYPE_STANDALONE) || (type == IH_TYPE_RAMDISK)) { - fit_image_get_entry(fit, image_noffset, &entry); + ret = fit_image_get_entry(fit, image_noffset, &entry); printf("%s Entry Point: ", p); if (ret) printf("unavailable\n"); else - printf("0x%08lx\n", entry); + printf(PRIpa "\n", entry); } /* Process all hash subnodes of the component image node */ @@ -675,11 +677,37 @@ int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp) return 0; } +static int fit_image_get_address(const void *fit, int noffset, char *name, + phys_addr_t *load) +{ + int len, cell_len; + const fdt32_t *cell; + + cell = fdt_getprop(fit, noffset, name, &len); + if (cell == NULL) { + fit_get_debug(fit, noffset, name, len); + return -1; + } + + if (len > sizeof(phys_addr_t)) { + printf("Unsupported %s address size\n", name); + return -1; + } + + cell_len = len >> 2; + *load = 0; + while (cell_len--) { + *load = (*load << 32) | uimage_to_cpu(*cell); + cell++; + } + + return 0; +} /** * fit_image_get_load() - get load addr property for given component image node * @fit: pointer to the FIT format image header * @noffset: component image node offset - * @load: pointer to the uint32_t, will hold load address + * @load: pointer to the phys_addr_t, will hold load address * * fit_image_get_load() finds load address property in a given component * image node. If the property is found, its value is returned to the caller. @@ -688,26 +716,16 @@ int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp) * 0, on success * -1, on failure */ -int fit_image_get_load(const void *fit, int noffset, ulong *load) +int fit_image_get_load(const void *fit, int noffset, phys_addr_t *load) { - int len; - const uint32_t *data; - - data = fdt_getprop(fit, noffset, FIT_LOAD_PROP, &len); - if (data == NULL) { - fit_get_debug(fit, noffset, FIT_LOAD_PROP, len); - return -1; - } - - *load = uimage_to_cpu(*data); - return 0; + return fit_image_get_address(fit, noffset, FIT_LOAD_PROP, load); } /** * fit_image_get_entry() - get entry point address property * @fit: pointer to the FIT format image header * @noffset: component image node offset - * @entry: pointer to the uint32_t, will hold entry point address + * @entry: pointer to the phys_addr_t, will hold entry point address * * This gets the entry point address property for a given component image * node. @@ -720,19 +738,9 @@ int fit_image_get_load(const void *fit, int noffset, ulong *load) * 0, on success * -1, on failure */ -int fit_image_get_entry(const void *fit, int noffset, ulong *entry) +int fit_image_get_entry(const void *fit, int noffset, phys_addr_t *entry) { - int len; - const uint32_t *data; - - data = fdt_getprop(fit, noffset, FIT_ENTRY_PROP, &len); - if (data == NULL) { - fit_get_debug(fit, noffset, FIT_ENTRY_PROP, len); - return -1; - } - - *entry = uimage_to_cpu(*data); - return 0; + return fit_image_get_address(fit, noffset, FIT_ENTRY_PROP, entry); } /** @@ -1554,7 +1562,7 @@ static const char *fit_get_image_type_property(int type) int fit_image_load(bootm_headers_t *images, ulong addr, const char **fit_unamep, const char **fit_uname_configp, int arch, int image_type, int bootstage_id, - enum fit_load_op load_op, ulong *datap, ulong *lenp) + enum fit_load_op load_op, phys_addr_t *datap, ulong *lenp) { int cfg_noffset, noffset; const char *fit_uname; @@ -1563,7 +1571,8 @@ int fit_image_load(bootm_headers_t *images, ulong addr, const void *buf; size_t size; int type_ok, os_ok; - ulong load, data, len; + phys_addr_t load; + ulong data, len; uint8_t os; const char *prop_name; int ret; @@ -1719,7 +1728,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr, } } else if (load_op != FIT_LOAD_OPTIONAL_NON_ZERO || load) { ulong image_start, image_end; - ulong load_end; + phys_addr_t load_end; void *dst; /* @@ -1736,8 +1745,8 @@ int fit_image_load(bootm_headers_t *images, ulong addr, return -EXDEV; } - printf(" Loading %s from 0x%08lx to 0x%08lx\n", - prop_name, data, load); + printf(" Loading %s from 0x%08lx to %08llx\n", + prop_name, data, (uint64_t)load); dst = map_sysmem(load, len); memmove(dst, buf, len); @@ -1756,7 +1765,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr, } int boot_get_setup_fit(bootm_headers_t *images, uint8_t arch, - ulong *setup_start, ulong *setup_len) + phys_addr_t *setup_start, ulong *setup_len) { int noffset; ulong addr; diff --git a/include/bootm.h b/include/bootm.h index 4981377..f280ace 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -69,8 +69,8 @@ void arch_preboot_os(void); * @unc_len: Available space for decompression * @return 0 if OK, -ve on error (BOOTM_ERR_...) */ -int bootm_decomp_image(int comp, ulong load, ulong image_start, int type, - void *load_buf, void *image_buf, ulong image_len, - uint unc_len, ulong *load_end); +int bootm_decomp_image(int comp, phys_addr_t load, phys_addr_t image_start, + int type, void *load_buf, void *image_buf, + ulong image_len, uint unc_len, ulong *load_end); #endif diff --git a/include/image.h b/include/image.h index 63c3d37..bc41ecb 100644 --- a/include/image.h +++ b/include/image.h @@ -33,11 +33,15 @@ struct lmb; #define IMAGE_ENABLE_IGNORE 0 #define IMAGE_INDENT_STRING "" +/* Be able to hold physical address */ +typedef unsigned long long phys_addr_t; + #else #include <lmb.h> #include <asm/u-boot.h> #include <command.h> +#include <linux/types.h> /* Take notice of the 'ignore' property for hashes */ #define IMAGE_ENABLE_IGNORE 1 @@ -494,7 +498,7 @@ int boot_get_loadable(int argc, char * const argv[], bootm_headers_t *images, #endif /* !USE_HOSTCC */ int boot_get_setup_fit(bootm_headers_t *images, uint8_t arch, - ulong *setup_start, ulong *setup_len); + phys_addr_t *setup_start, ulong *setup_len); /** * fit_image_load() - load an image from a FIT @@ -529,7 +533,7 @@ int boot_get_setup_fit(bootm_headers_t *images, uint8_t arch, int fit_image_load(bootm_headers_t *images, ulong addr, const char **fit_unamep, const char **fit_uname_configp, int arch, int image_type, int bootstage_id, - enum fit_load_op load_op, ulong *datap, ulong *lenp); + enum fit_load_op load_op, phys_addr_t *datap, ulong *lenp); #ifndef USE_HOSTCC /** @@ -840,8 +844,8 @@ int fit_image_get_os(const void *fit, int noffset, uint8_t *os); int fit_image_get_arch(const void *fit, int noffset, uint8_t *arch); int fit_image_get_type(const void *fit, int noffset, uint8_t *type); int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp); -int fit_image_get_load(const void *fit, int noffset, ulong *load); -int fit_image_get_entry(const void *fit, int noffset, ulong *entry); +int fit_image_get_load(const void *fit, int noffset, phys_addr_t *load); +int fit_image_get_entry(const void *fit, int noffset, phys_addr_t *entry); int fit_image_get_data(const void *fit, int noffset, const void **data, size_t *size); -- 1.7.9.5

2 8

[U-Boot] [PATCH 0/7] Add board detection for Odroid XU3 / XU3Lite / XU4
by Przemyslaw Marczak 06 Nov '15

06 Nov '15

This patchset adds: - define the CPU name for Chromebook Peach Pi as Exynos5800 - set the cpu id of Exynos5422 to 0x5422 - S2MPS11 PMIC I/O driver - Exynos5420-compatible (9-channel, 12-bit) ADC driver - board detection for Odroid XU3 / XU3lite / XU4 This was tested on Odroid XU3 and XU3 Lite, without the XU4, but I'm waiting for reply from the Odroid forum users. Tested with buildman for samsung. Available on github: https://github.com/bobenstein/u-boot/tree/xu3-patchset-test Przemyslaw Marczak (7): s5p: cpu_info: use defined CPU name if available peach-pi: define CPU name for SoC Exynos5800 Exynos5422/5800: set cpu id to 0x5422 dm: pmic: add s2mps11 PMIC I/O driver odroid-xu3: enable s2mps11 PMIC support Exynos: add internal ADC driver exynos5-dt: add board detection for Odroid XU3/XU3L/XU4. arch/arm/cpu/armv7/s5p-common/cpu_info.c | 5 ++ arch/arm/dts/exynos5422-odroidxu3.dts | 7 ++ arch/arm/mach-exynos/Makefile | 1 + arch/arm/mach-exynos/adc.c | 83 ++++++++++++++++++++++ arch/arm/mach-exynos/clock.c | 16 ++--- arch/arm/mach-exynos/clock_init_exynos5.c | 2 +- arch/arm/mach-exynos/common_setup.h | 4 +- arch/arm/mach-exynos/include/mach/adc.h | 45 ++++++++++++ arch/arm/mach-exynos/include/mach/cpu.h | 10 +-- arch/arm/mach-exynos/include/mach/gpio.h | 4 +- arch/arm/mach-exynos/pinmux.c | 2 +- arch/arm/mach-exynos/power.c | 2 +- board/samsung/common/exynos5-dt.c | 114 ++++++++++++++++++++++++++++++ configs/odroid-xu3_defconfig | 3 + doc/device-tree-bindings/pmic/s2mps11.txt | 17 +++++ drivers/power/pmic/Kconfig | 14 ++++ drivers/power/pmic/Makefile | 1 + drivers/power/pmic/s2mps11.c | 60 ++++++++++++++++ include/configs/odroid_xu3.h | 12 ++++ include/configs/peach-pi.h | 2 + include/power/s2mps11.h | 109 ++++++++++++++++++++++++++++ 21 files changed, 493 insertions(+), 20 deletions(-) create mode 100644 arch/arm/mach-exynos/adc.c create mode 100644 doc/device-tree-bindings/pmic/s2mps11.txt create mode 100644 drivers/power/pmic/s2mps11.c create mode 100644 include/power/s2mps11.h -- 1.9.1

6 105

[U-Boot] [PATCH v4 00/16] spi: zynq qspi support
by Jagan Teki 05 Nov '15

05 Nov '15

These are the previous version patches- https://patchwork.ozlabs.org/patch/302945/ https://patchwork.ozlabs.org/patch/264440/ This series adds zynq qspi controller driver in driver model and enabled support on relevent zynq boards and tested the same. Branch to verify: $ git clone git://git.denx.de/u-boot-spi.git $ cd u-boot-spi $ git checkout -b master-next origin/master-next Changes for v4: - Rebase to master Changes for v3: - Added driver-model to zynq-qspi driver - devicetree support on zynq-qspi - Enabled qspi nodes on relevent board dts files - Enabled qspi driver on relevent board config files Changes for v3: - Fixes with macro's addition Jagan Teki (16): spi: Add zynq qspi controller driver dts: zynq: Add zynq qspi controller nodes doc: device-tree-bindings: spi: Add zynq qspi info dts: microzed: Enable zynq qspi controller node dts: zc702: Enable zynq qspi controller node dts: zc706: Enable zynq qspi controller node dts: zc770-xm010: Enable zynq qspi controller node dts: zed: Enable zynq qspi controller node configs: Enable legacy SPI flash interface support zynq-common: Enable zynq qspi controller support zynq-common: Enable Bank/Extended address register support configs: zynq: Enable zynq qspi controller spi: Kconfig: Add Zynq QSPI controller entry spi: zynq_spi: Add config reg shift named macros spi: zynq_spi: Rename baudrate divisor mask name spi: zynq_spi: Store cs value into private data arch/arm/dts/zynq-7000.dtsi | 12 + arch/arm/dts/zynq-microzed.dts | 5 + arch/arm/dts/zynq-zc702.dts | 5 + arch/arm/dts/zynq-zc706.dts | 5 + arch/arm/dts/zynq-zc770-xm010.dts | 5 + arch/arm/dts/zynq-zed.dts | 5 + configs/zynq_microzed_defconfig | 2 + configs/zynq_zc702_defconfig | 2 + configs/zynq_zc706_defconfig | 2 + configs/zynq_zc70x_defconfig | 2 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zed_defconfig | 2 + doc/device-tree-bindings/spi/spi-zynq-qspi.txt | 26 ++ drivers/spi/Kconfig | 9 + drivers/spi/Makefile | 1 + drivers/spi/zynq_qspi.c | 622 +++++++++++++++++++++++++ drivers/spi/zynq_spi.c | 20 +- include/configs/zynq-common.h | 10 + 18 files changed, 729 insertions(+), 7 deletions(-) create mode 100644 doc/device-tree-bindings/spi/spi-zynq-qspi.txt create mode 100644 drivers/spi/zynq_qspi.c -- 1.9.1

4 33

[U-Boot] [PATCH v2] mmc: sdhci: Fix the SD clock stop sequence
by Wenyou Yang 03 Nov '15

03 Nov '15

According to the SDHC specification, stopping the SD Clock is by setting the SD Clock Enable bit in the Clock Control register at 0, instead of setting all bits at 0. Before stopping the SD clock, we need to make sure all SD transactions to complete, so add checking the CMD and DAT bits in the Presen State register, before stopping the SD clock. Signed-off-by: Wenyou Yang <wenyou.yang(a)atmel.com> --- Changes in v2: - Add timeout to wait for the cmd & data inhibit bit drivers/mmc/sdhci.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index d89e302..02d71b9 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -286,9 +286,25 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, static int sdhci_set_clock(struct mmc *mmc, unsigned int clock) { struct sdhci_host *host = mmc->priv; - unsigned int div, clk, timeout; + unsigned int div, clk, timeout, reg; - sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL); + /* Wait max 20 ms */ + timeout = 200; + while (sdhci_readl(host, SDHCI_PRESENT_STATE) & + (SDHCI_CMD_INHIBIT | SDHCI_DATA_INHIBIT)) { + if (timeout == 0) { + printf("%s: Timeout to wait cmd & data inhibit\n", + __func__); + return -1; + } + + timeout--; + udelay(100); + } + + reg = sdhci_readw(host, SDHCI_CLOCK_CONTROL); + reg &= ~SDHCI_CLOCK_CARD_EN; + sdhci_writew(host, reg, SDHCI_CLOCK_CONTROL); if (clock == 0) return 0; -- 1.7.9.5

2 1