May 2016 - U-Boot

[U-Boot] [PATCH] ARM: OMAP4+: Fix DPLL programming sequence
by Lokesh Vutla 30 May '16

30 May '16

All the output clock parameters of a DPLL needs to be programmed before locking the DPLL. But it is being configured after locking the DPLL which could potentially bypass DPLL. So fixing this sequence. Reported-by: Richard Woodruff <r-woodruff2(a)ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- arch/arm/cpu/armv7/omap-common/clocks-common.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/omap-common/clocks-common.c b/arch/arm/cpu/armv7/omap-common/clocks-common.c index ef2ac98..2de9935 100644 --- a/arch/arm/cpu/armv7/omap-common/clocks-common.c +++ b/arch/arm/cpu/armv7/omap-common/clocks-common.c @@ -236,6 +236,8 @@ static void do_setup_dpll(u32 const base, const struct dpll_params *params, /* Dpll locked with ideal values for nominal opps. */ debug("\n %s Dpll already locked with ideal" "nominal opp values", dpll); + + bypass_dpll(base); goto setup_post_dividers; } } @@ -251,13 +253,13 @@ static void do_setup_dpll(u32 const base, const struct dpll_params *params, writel(temp, &dpll_regs->cm_clksel_dpll); +setup_post_dividers: + setup_post_dividers(base, params); + /* Lock */ if (lock) do_lock_dpll(base); -setup_post_dividers: - setup_post_dividers(base, params); - /* Wait till the DPLL locks */ if (lock) wait_for_lock(base); -- 2.8.2

3 2

[U-Boot] [PATCH] tools: Add entry for generated tools/bin2header to tools/.gitignore
by Robert P. J. Day 30 May '16

30 May '16

Signed-off-by: Robert P. J. Day <rpjday(a)crashcourse.ca> --- diff --git a/tools/.gitignore b/tools/.gitignore index ff07680..cb1e722 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -1,4 +1,5 @@ /atmel_pmecc_params +/bin2header /bmp_logo /envcrc /fdtgrep -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

2 1

[U-Boot] [PATCH] tools/genboardscfg.py: remove bogus import subprocess
by Masahiro Yamada 30 May '16

30 May '16

Since f6c8f38ec601 ("tools/genboardscfg.py: improve performance more with Kconfiglib"), this tool does not use the subprocess module. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- tools/genboardscfg.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py index 23c956b..c2efad5 100755 --- a/tools/genboardscfg.py +++ b/tools/genboardscfg.py @@ -21,7 +21,6 @@ import glob import multiprocessing import optparse import os -import subprocess import sys import tempfile import time -- 1.9.1

2 1

[U-Boot] [PATCH] image.h: Tighten up content using handy CONFIG_IS_ENABLED() macro.
by Robert P. J. Day 30 May '16

30 May '16

Signed-off-by: Robert P. J. Day <rpjday(a)crashcourse.ca> --- figured that if there's a handy macro for this, might as well use it to make the header file easier to read. compile-tested building for sandbox on x86_64. did i do anything obviously silly? diff --git a/include/image.h b/include/image.h index f9ee564..9e7a96e 100644 --- a/include/image.h +++ b/include/image.h @@ -53,18 +53,10 @@ struct lmb; #include <libfdt.h> #include <fdt_support.h> # ifdef CONFIG_SPL_BUILD -# ifdef CONFIG_SPL_CRC32_SUPPORT -# define IMAGE_ENABLE_CRC32 1 -# endif -# ifdef CONFIG_SPL_MD5_SUPPORT -# define IMAGE_ENABLE_MD5 1 -# endif -# ifdef CONFIG_SPL_SHA1_SUPPORT -# define IMAGE_ENABLE_SHA1 1 -# endif -# ifdef CONFIG_SPL_SHA256_SUPPORT -# define IMAGE_ENABLE_SHA256 1 -# endif +# define IMAGE_ENABLE_CRC32 CONFIG_IS_ENABLED(SPL_CRC32_SUPPORT) +# define IMAGE_ENABLE_MD5 CONFIG_IS_ENABLED(SPL_MD5_SUPPORT) +# define IMAGE_ENABLE_SHA1 CONFIG_IS_ENABLED(SPL_SHA1_SUPPORT) +# define IMAGE_ENABLE_SHA256 CONFIG_IS_ENABLED(SPL_SHA256_SUPPORT) # else # define CONFIG_CRC32 /* FIT images need CRC32 support */ # define CONFIG_MD5 /* and MD5 */ @@ -76,52 +68,17 @@ struct lmb; # define IMAGE_ENABLE_SHA256 1 # endif -#ifdef CONFIG_FIT_DISABLE_SHA256 -#undef CONFIG_SHA256 -#undef IMAGE_ENABLE_SHA256 -#endif - -#ifndef IMAGE_ENABLE_CRC32 -#define IMAGE_ENABLE_CRC32 0 -#endif - -#ifndef IMAGE_ENABLE_MD5 -#define IMAGE_ENABLE_MD5 0 -#endif - -#ifndef IMAGE_ENABLE_SHA1 -#define IMAGE_ENABLE_SHA1 0 -#endif - -#ifndef IMAGE_ENABLE_SHA256 -#define IMAGE_ENABLE_SHA256 0 -#endif +# ifdef CONFIG_FIT_DISABLE_SHA256 +# undef CONFIG_SHA256 +# undef IMAGE_ENABLE_SHA256 +# endif #endif /* IMAGE_ENABLE_FIT */ -#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH -# define IMAGE_ENABLE_RAMDISK_HIGH 1 -#else -# define IMAGE_ENABLE_RAMDISK_HIGH 0 -#endif - -#ifdef CONFIG_SYS_BOOT_GET_CMDLINE -# define IMAGE_BOOT_GET_CMDLINE 1 -#else -# define IMAGE_BOOT_GET_CMDLINE 0 -#endif - -#ifdef CONFIG_OF_BOARD_SETUP -# define IMAGE_OF_BOARD_SETUP 1 -#else -# define IMAGE_OF_BOARD_SETUP 0 -#endif - -#ifdef CONFIG_OF_SYSTEM_SETUP -# define IMAGE_OF_SYSTEM_SETUP 1 -#else -# define IMAGE_OF_SYSTEM_SETUP 0 -#endif +#define IMAGE_ENABLE_RAMDISK_HIGH CONFIG_IS_ENABLED(SYS_BOOT_RAMDISK_HIGH) +#define IMAGE_BOOT_GET_CMDLINE CONFIG_IS_ENABLED(SYS_BOOT_GET_CMDLINE) +#define IMAGE_OF_BOARD_SETUP CONFIG_IS_ENABLED(OF_BOARD_SETUP) +#define IMAGE_OF_SYSTEM_SETUP CONFIG_IS_ENABLED(OF_SYSTEM_SETUP) /* * Operating System Codes -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

2 1

[U-Boot] [PATCH] omap3: Fix SPI registers on am33xx and am34xx
by Martin Hejnfelt 30 May '16

30 May '16

When the base registers are read from device tree the base is not 0x48030100 as the driver expects, but 0x48030000, resulting in non functioning SPI. To deal with this, use same idea as how this is done in the linux kernel (drivers/spi/spi-omap2-mcspi.c) and add a structure with a field that is used to shift the registers on these systems. Signed-off-by: Martin Hejnfelt <mh(a)newtec.dk> --- drivers/spi/omap3_spi.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index 2fe34c9..60e9d6e 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -35,6 +35,12 @@ DECLARE_GLOBAL_DATA_PTR; #define OMAP3_MCSPI4_BASE 0x480BA000 #endif +#define OMAP4_MCSPI_REG_OFFSET 0x100 + +struct omap2_mcspi_platform_config { + unsigned int regs_offset; +}; + /* per-register bitmasks */ #define OMAP3_MCSPI_SYSCONFIG_SMARTIDLE (2 << 3) #define OMAP3_MCSPI_SYSCONFIG_ENAWAKEUP BIT(2) @@ -623,7 +629,10 @@ static int omap3_spi_probe(struct udevice *dev) const void *blob = gd->fdt_blob; int node = dev->of_offset; - priv->regs = (struct mcspi *)dev_get_addr(dev); + struct omap2_mcspi_platform_config* data = + (struct omap2_mcspi_platform_config*)dev_get_driver_data(dev); + + priv->regs = (struct mcspi *)(dev_get_addr(dev) + data->regs_offset); priv->pin_dir = fdtdec_get_uint(blob, node, "ti,pindir-d0-out-d1-in", MCSPI_PINDIR_D0_IN_D1_OUT); priv->wordlen = SPI_DEFAULT_WORDLEN; @@ -662,9 +671,17 @@ static const struct dm_spi_ops omap3_spi_ops = { */ }; +static struct omap2_mcspi_platform_config omap2_pdata = { + .regs_offset = 0, +}; + +static struct omap2_mcspi_platform_config omap4_pdata = { + .regs_offset = OMAP4_MCSPI_REG_OFFSET, +}; + static const struct udevice_id omap3_spi_ids[] = { - { .compatible = "ti,omap2-mcspi" }, - { .compatible = "ti,omap4-mcspi" }, + { .compatible = "ti,omap2-mcspi", .data = (ulong)&omap2_pdata }, + { .compatible = "ti,omap4-mcspi", .data = (ulong)&omap4_pdata }, { } }; -- 1.9.1

2 1

[U-Boot] [PATCH 0/3] arm64: minor fixes of cache operation routine
by Masahiro Yamada 30 May '16

30 May '16

Masahiro Yamada (3): arm64: optimize __asm_{flush,invalidate}_dcache_all arm64: fix comment "flush & invalidate" arm64: rename __asm_flush_dcache_level to __asm_dcache_level arch/arm/cpu/armv8/cache.S | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) -- 1.9.1

3 7

[U-Boot] [PATCH v2 0/8] ARM: AM335x: Add support for ICEv2 board
by Lokesh Vutla 30 May '16

30 May '16

TI's Industrial Communication Engine EVM is a low cost hardware mainly developed for industrial communication type applications using serial or Ethernet based interfaces. This platform features TI's AM3359 with 800MHz single core Cortex-A8 processor, 256MB DDR3, 64MB SPI flash, 8MB NOR Flash, mmc, usb, can, dual Ethernet ports. For more information, look at HW user guide[1], Data manual[2]. Just add basic support for the moment. [1] http://processors.wiki.ti.com/index.php/AM335x_Industrial_Communication_Eng… [2] http://www.ti.com/lit/ds/symlink/am3359.pdf Link to v1: https://www.mail-archive.com/u-boot%40lists.denx.de/msg212330.html Changes since v1: - Removed am335x_icev2_defconfig and allowed to choose UART dynamically. Lokesh Vutla (8): board: AM335x-ICEv2: Add epprom support board: AM335x-ICEv2: Add pinmux support board: AM335x-ICEv2: Add DDR data ARM: AM33xx: Add support for Clock Synthesizer board: AM335x-ICEv2: Add cpsw support config: env: Set AM335x-ICEv2 board specific env ARM: dts: AM335x-ICEv2: Add minimal dts support board: am335x: Allow to choose serial device dynamically arch/arm/cpu/armv7/am33xx/Makefile | 2 + arch/arm/cpu/armv7/am33xx/clk_synthesizer.c | 104 +++++ arch/arm/dts/Makefile | 3 +- arch/arm/dts/am335x-icev2.dts | 430 +++++++++++++++++++++ arch/arm/include/asm/arch-am33xx/clk_synthesizer.h | 43 +++ arch/arm/include/asm/arch-am33xx/ddr_defs.h | 15 + board/ti/am335x/board.c | 139 ++++++- board/ti/am335x/board.h | 5 + board/ti/am335x/mux.c | 31 ++ configs/am335x_evm_defconfig | 2 +- include/configs/am335x_evm.h | 14 + include/serial.h | 4 + 12 files changed, 783 insertions(+), 9 deletions(-) create mode 100644 arch/arm/cpu/armv7/am33xx/clk_synthesizer.c create mode 100644 arch/arm/dts/am335x-icev2.dts create mode 100644 arch/arm/include/asm/arch-am33xx/clk_synthesizer.h -- 2.8.2

2 20

[U-Boot] [PATCH v2 0/7] ARM: AM335x: Add support for FIT and various platforms
by Lokesh Vutla 30 May '16

30 May '16

This series adds support for FIT and various AM335x based platforms Link to v1: https://www.mail-archive.com/u-boot%40lists.denx.de/msg212314.html Lokesh Vutla (5): board: am33xx: fit: add support for selecting dtb dynamically ARM: dts: am335x-bone: Enable uart and timer ARM: AM335x: Enable FIT ARM: dts: AM335x-evmsk: Add initial support ARM: dts: AM335x-BBG: Add initial support Mugunthan V N (1): ARM: dts: am335x: fix cd-gpios definition as per hardware design and dt binding docs Tom Rini (1): configs: am335x_evm: Switch to env on FAT SD by default arch/arm/dts/Makefile | 4 +- arch/arm/dts/am335x-bone-common.dtsi | 8 +- arch/arm/dts/am335x-bone.dts | 3 - arch/arm/dts/am335x-bonegreen.dts | 57 +++ arch/arm/dts/am335x-evm.dts | 2 +- arch/arm/dts/am335x-evmsk.dts | 720 +++++++++++++++++++++++++++++++++++ board/ti/am335x/MAINTAINERS | 1 - board/ti/am335x/board.c | 18 + configs/am335x_evm_defconfig | 17 +- configs/am335x_gp_evm_defconfig | 46 --- include/configs/am335x_evm.h | 40 +- include/dt-bindings/pinctrl/omap.h | 37 ++ 12 files changed, 874 insertions(+), 79 deletions(-) create mode 100644 arch/arm/dts/am335x-bonegreen.dts create mode 100644 arch/arm/dts/am335x-evmsk.dts delete mode 100644 configs/am335x_gp_evm_defconfig -- 2.8.2

2 17

[U-Boot] [PATCH v2 0/5] ARM: AM43xx: Enable FIT and EPOS, IDK support
by Lokesh Vutla 30 May '16

30 May '16

This series adds support for AM43x-EPOS, AM437x-IDK. Also enabled FIT support for all platforms. Link to v1: https://www.mail-archive.com/u-boot%40lists.denx.de/msg212279.html Lokesh Vutla (5): board: AM43xx: fit: add support for selecting dtb dynamically ARM: AM43xx: Enable FIT ARM: dts: AM43x-EPOS Initial Support ARM: dts: AM437x-IDK Initial Support ARM: AM43xx: configs: Update usb host boot defconfig arch/arm/dts/Makefile | 4 +- arch/arm/dts/am437x-idk-evm.dts | 420 +++++++++++ arch/arm/dts/am43x-epos-evm.dts | 806 ++++++++++++++++++++++ board/ti/am43xx/MAINTAINERS | 2 - board/ti/am43xx/board.c | 16 + configs/am437x_gp_evm_defconfig | 49 -- configs/am437x_sk_evm_defconfig | 53 -- configs/am43xx_evm_defconfig | 18 +- configs/am43xx_evm_usbhost_boot_defconfig | 15 +- include/dt-bindings/pinctrl/am43xx.h | 6 + include/dt-bindings/sound/tlv320aic31xx-micbias.h | 8 + 11 files changed, 1288 insertions(+), 109 deletions(-) create mode 100644 arch/arm/dts/am437x-idk-evm.dts create mode 100644 arch/arm/dts/am43x-epos-evm.dts delete mode 100644 configs/am437x_gp_evm_defconfig delete mode 100644 configs/am437x_sk_evm_defconfig create mode 100644 include/dt-bindings/sound/tlv320aic31xx-micbias.h -- 2.8.2

2 11

[U-Boot] [PATCH v2 0/3] ARM: DRA7xx: Enable FIT
by Lokesh Vutla 30 May '16

30 May '16

This series enables FIT for DRA7xx platforms. Depends on the FIT support series posted recently. Link to v1: https://www.mail-archive.com/u-boot@lists.denx.de/msg211963.html Lokesh Vutla (3): board: dra7: fit: add support for selecting dtb dynamically ARM: DRA7: Enable FIT ARM: DRA7: configs: Remove obsolete configs board/ti/dra7xx/MAINTAINERS | 5 +--- board/ti/dra7xx/evm.c | 12 ++++++++ configs/dra72_evm_defconfig | 53 ----------------------------------- configs/dra74_evm_defconfig | 52 ---------------------------------- configs/dra7xx_evm_defconfig | 15 +++++++++- configs/dra7xx_evm_qspiboot_defconfig | 43 ---------------------------- configs/dra7xx_evm_uart3_defconfig | 44 ----------------------------- 7 files changed, 27 insertions(+), 197 deletions(-) delete mode 100644 configs/dra72_evm_defconfig delete mode 100644 configs/dra74_evm_defconfig delete mode 100644 configs/dra7xx_evm_qspiboot_defconfig delete mode 100644 configs/dra7xx_evm_uart3_defconfig -- 2.8.2

2 7