May 2017 - U-Boot

[U-Boot] Patchset v3 Poplar 96Boards EE
by Jorge Ramirez-Ortiz 08 May '17

08 May '17

[PATCHv3 1/5] ARM64: dts: hi3798cv200-poplar: add device tree bindings [PATCHv3 2/5] ARM64: dts: poplar: add usb-ehci node [PATCHv3 3/5] ARM64: dts: poplar: add clock frequency to the console [PATCHv3 4/5] driver: mmc: update debug info [PATCHv3 5/5] ARM64: poplar: hi3798cv200: u-boot support for Poplar The following changes with respect to v0 following comments from Marek and Tom: - Refresh device tree bindings from linux-next - Simplified include/configs/poplar.h to bare minimum - use echi-generic USB2 driver (DM_USB) - sanitize usb2 phy initialization

4 12

[U-Boot] [PATCH 0/2] ARM: k2g: Add support for dynamic programming of PLL
by Lokesh Vutla 08 May '17

08 May '17

As k2g supports various sysclk frequencies, this series support PLL configuration for all supported sysclk frequencies. This series depends on Franklin's K2G ICE support series[1] [1] https://lists.denx.de/pipermail/u-boot/2017-March/282913.html Lokesh Vutla (2): ARM: k2g: Add support for dynamic programming of PLL based on SYSCLK ARM: keystone2: Add support for getting external clock dynamically arch/arm/mach-keystone/clock.c | 12 +- arch/arm/mach-keystone/include/mach/clock-k2g.h | 4 +- arch/arm/mach-keystone/include/mach/clock.h | 2 +- arch/arm/mach-keystone/include/mach/hardware-k2g.h | 21 +++ board/ti/ks2_evm/board_k2e.c | 30 ++++- board/ti/ks2_evm/board_k2g.c | 150 +++++++++++++++++---- board/ti/ks2_evm/board_k2hk.c | 31 +++++ board/ti/ks2_evm/board_k2l.c | 34 ++++- include/configs/ti_armv7_keystone2.h | 2 +- 9 files changed, 235 insertions(+), 51 deletions(-) -- 2.11.0

2 6

[U-Boot] [PATCH v3 1/4] tools: moveconfig: extract helper function for user confirmation
by Chris Packham 08 May '17

08 May '17

Avoid repetitive code dealing with asking the user for confirmation. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- Changes in v3: None Changes in v2: None tools/moveconfig.py | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/tools/moveconfig.py b/tools/moveconfig.py index dcca0ec..f8d4857 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -435,6 +435,20 @@ def extend_matched_lines(lines, matched, pre_patterns, post_patterns, extend_pre matched += extended_matched matched.sort() +def confirm(options, prompt): + if not options.yes: + while True: + choice = raw_input('{} [y/n]: '.format(prompt)) + choice = choice.lower() + print choice + if choice == 'y' or choice == 'n': + break + + if choice == 'n': + return False + + return True + def cleanup_one_header(header_path, patterns, options): """Clean regex-matched lines away from a file. @@ -502,15 +516,8 @@ def cleanup_headers(configs, options): configs: A list of CONFIGs to remove. options: option flags. """ - if not options.yes: - while True: - choice = raw_input('Clean up headers? [y/n]: ').lower() - print choice - if choice == 'y' or choice == 'n': - break - - if choice == 'n': - return + if not confirm(options, 'Clean up headers?'): + return patterns = [] for config in configs: @@ -582,16 +589,8 @@ def cleanup_extra_options(configs, options): configs: A list of CONFIGs to remove. options: option flags. """ - if not options.yes: - while True: - choice = (raw_input('Clean up CONFIG_SYS_EXTRA_OPTIONS? [y/n]: '). - lower()) - print choice - if choice == 'y' or choice == 'n': - break - - if choice == 'n': - return + if not confirm(options, 'Clean up CONFIG_SYS_EXTRA_OPTIONS?'): + return configs = [ config[len('CONFIG_'):] for config in configs ] -- 2.10.1

3 11

[U-Boot] [PATCH v4 0/3] DS1307 RTC update
by Chris Packham 08 May '17

08 May '17

4 10

[U-Boot] [PATCH 0/6] configs: ti: consolidate cmd options
by Lokesh Vutla 08 May '17

08 May '17

This series creates a Kconfig symbol for TI platforms that includes common command options that are defined by defconfigs. Also do a savedefconfig once this option is enabled. Lokesh Vutla (6): board: ti: Define Kconfig symbol for common cmd options configs: am335x: Enable TI_COMMON_CMD_OPTIONS configs: am43xx: Enable TI_COMMON_CMD_OPTIONS configs: am57xx: Enable TI_COMMON_CMD_OPTIONS configs: dra7xx: Enable TI_COMMON_CMD_OPTIONS configs: ks2: Enable TI_COMMON_CMD_OPTIONS board/ti/common/Kconfig | 26 ++++++++++++++++++++++++++ configs/am335x_evm_defconfig | 12 +----------- configs/am335x_hs_evm_defconfig | 13 +------------ configs/am43xx_evm_defconfig | 25 +------------------------ configs/am43xx_hs_evm_defconfig | 24 +----------------------- configs/am57xx_evm_defconfig | 23 ++--------------------- configs/am57xx_hs_evm_defconfig | 22 +--------------------- configs/dra7xx_evm_defconfig | 25 ++----------------------- configs/dra7xx_hs_evm_defconfig | 23 +---------------------- configs/k2e_evm_defconfig | 21 +++++---------------- configs/k2e_hs_evm_defconfig | 19 ++++--------------- configs/k2g_evm_defconfig | 21 ++++----------------- configs/k2g_hs_evm_defconfig | 23 +++++------------------ configs/k2hk_evm_defconfig | 21 +++++---------------- configs/k2hk_hs_evm_defconfig | 19 ++++--------------- configs/k2l_evm_defconfig | 21 +++++---------------- 16 files changed, 68 insertions(+), 270 deletions(-) -- 2.11.0

3 17

[U-Boot] [PATCH v1 00/15] Expand Aspeed AST2500 Support
by Maxim Sloyko 08 May '17

08 May '17

This series expands support for Aspeed AST2500 SoC, commonly used as Board Management Controller in many servers. The main goal of this series is I2C driver, the rest are either cleanups or supporting patches. Most notable among them is addition of Watchdog uclass, so that watchdog drivers can now use Driver Model. One notable thing that is *missing* from this series is Device Tree configuration for I2C driver. The Linux Kernel I2C driver is still under review and it may affect the details of how devices need to be configured in the Device Tree. So, I decided to wait until it will show up in Linux Kernel DT and then pull it into U-Boot. I removed Network driver from this series. I will work on it separately and will make it compatible with existing Faraday devices, but that is a work better done outside of this already long series. Changes in v1: - Added link to the original version to commit message - Rename wdt_reset to wdt_expire_now - Rename wdt_restart to wdt_reset - Clarified function documentation in few cases - Add Sandbox WDT driver and unit tests - Rename reset to expire_now - Rename restart to reset - Remove unnecessary check for error in dev_get_priv - Fix comment - Rename wdt_reset call to wdt_expire_now - Rename wdt_reset call to wdt_expire_now - Style fixes Maxim Sloyko (15): aspeed: Update ast2500 Device Tree dm: Simple Watchdog uclass aspeed: Watchdog Timer Driver aspeed: Make SCU lock/unlock functions part of SCU API aspeed: Reset Driver aspeed: Device Tree configuration for Reset Driver aspeed: Refactor AST2500 RAM Driver and Sysreset Driver aspeed: AST2500 Pinctrl Driver aspeed: Enable Pinctrl Driver in AST2500 EVB aspeed: Add P-Bus clock in ast2500 clock driver aspeed: Add I2C Driver aspeed: Enable I2C in EVB defconfig aspeed: Add support for Clocks needed by MACs aspeed: Refactor SCU to use consistent mask & shift aspeed: Cleanup ast2500-u-boot.dtsi Device Tree arch/arm/dts/ast2500-evb.dts | 15 + arch/arm/dts/ast2500-u-boot.dtsi | 59 +- arch/arm/dts/ast2500.dtsi | 881 ++++++++++++++++++++++++- arch/arm/include/asm/arch-aspeed/pinctrl.h | 52 ++ arch/arm/include/asm/arch-aspeed/scu_ast2500.h | 132 +++- arch/arm/include/asm/arch-aspeed/wdt.h | 38 +- arch/arm/mach-aspeed/Kconfig | 8 +- arch/arm/mach-aspeed/ast2500/clk_ast2500.c | 15 + arch/arm/mach-aspeed/ast2500/sdram_ast2500.c | 17 +- arch/arm/mach-aspeed/ast_wdt.c | 47 +- arch/sandbox/dts/test.dts | 4 + arch/sandbox/include/asm/state.h | 9 + configs/evb-ast2500_defconfig | 6 + configs/sandbox_defconfig | 2 + drivers/clk/aspeed/clk_ast2500.c | 321 +++++++-- drivers/i2c/Kconfig | 9 + drivers/i2c/Makefile | 1 + drivers/i2c/ast_i2c.c | 357 ++++++++++ drivers/i2c/ast_i2c.h | 132 ++++ drivers/pinctrl/Kconfig | 9 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/aspeed/Makefile | 1 + drivers/pinctrl/aspeed/pinctrl_ast2500.c | 127 ++++ drivers/reset/Kconfig | 10 + drivers/reset/Makefile | 1 + drivers/reset/ast2500-reset.c | 106 +++ drivers/sysreset/sysreset_ast.c | 24 +- drivers/watchdog/Kconfig | 32 + drivers/watchdog/Makefile | 3 + drivers/watchdog/ast_wdt.c | 125 ++++ drivers/watchdog/sandbox_wdt.c | 76 +++ drivers/watchdog/wdt-uclass.c | 72 ++ include/dm/uclass-id.h | 1 + include/dt-bindings/clock/ast2500-scu.h | 2 + include/dt-bindings/reset/ast2500-reset.h | 45 ++ include/wdt.h | 107 +++ test/dm/Makefile | 1 + test/dm/wdt.c | 40 ++ 38 files changed, 2721 insertions(+), 167 deletions(-) create mode 100644 arch/arm/include/asm/arch-aspeed/pinctrl.h create mode 100644 drivers/i2c/ast_i2c.c create mode 100644 drivers/i2c/ast_i2c.h create mode 100644 drivers/pinctrl/aspeed/Makefile create mode 100644 drivers/pinctrl/aspeed/pinctrl_ast2500.c create mode 100644 drivers/reset/ast2500-reset.c create mode 100644 drivers/watchdog/ast_wdt.c create mode 100644 drivers/watchdog/sandbox_wdt.c create mode 100644 drivers/watchdog/wdt-uclass.c create mode 100644 include/dt-bindings/reset/ast2500-reset.h create mode 100644 include/wdt.h create mode 100644 test/dm/wdt.c -- 2.12.2.762.g0e3151a226-goog

4 65

[U-Boot] [PATCH 0/7] Add IGEP SMARC AM335x module support
by Ladislav Michl 08 May '17

08 May '17

Hi there! this series adds support for ISEE's IGEP SMARC AM335x module. Patches 1, 2 and 4 are safe to apply, patch 3 is where a bit of controversy lays. I'm fine with redoing it, whenever better proposal appears, but note I'm not able to test all platforms (that's why I did it this way). Patch 5 brings UBI to AM335x ISEE's boards the same way it is done for OMAP3 based ones. And finally Pau's patch 6 adds support for SMARTC module. Best regards, ladis

4 24

[U-Boot] [PATCH v2] ARM: DT: STM32F746: add u-boot, dm-pre-reloc property to sub nodes
by Vikas Manocha 08 May '17

08 May '17

This patch is required for correct SPL device tree creation by fdtgrep as fdtgrep looks for u-boot,dm-pre-reloc property of the node to include it in the spl device tree. Not adding it in these subnodes ignores the pin muxing of peripherals which is almost always in the subnodes. Signed-off-by: Vikas Manocha <vikas.manocha(a)st.com> --- arch/arm/dts/stm32f7-u-boot.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 arch/arm/dts/stm32f7-u-boot.dtsi diff --git a/arch/arm/dts/stm32f7-u-boot.dtsi b/arch/arm/dts/stm32f7-u-boot.dtsi new file mode 100644 index 0000000..5f77f57 --- /dev/null +++ b/arch/arm/dts/stm32f7-u-boot.dtsi @@ -0,0 +1,24 @@ +&pinctrl { + usart1_pins_a: usart1@0 { + u-boot,dm-pre-reloc; + pins1 { + u-boot,dm-pre-reloc; + }; + pins2 { + u-boot,dm-pre-reloc; + }; + }; + fmc_pins: fmc@0 { + u-boot,dm-pre-reloc; + pins + { + u-boot,dm-pre-reloc; + }; + }; +}; + +&fmc { + bank1: bank@0 { + u-boot,dm-pre-reloc; + }; +}; -- 1.9.1

2 2

[U-Boot] [PATCH v4 00/18] stm32f7: add sdram & gpio drivers
by Vikas Manocha 08 May '17

08 May '17

This patchset : - adds stm32 sdram driver based on DM - adds stm32 gpio driver based on DM - uses clock & pin control drivers to replace board specific configurations from code - corrects sdram parameters as per correct sdram part - adds support for stm32f769 board Changed in v4: - rebased to master. Changed in v3: - made stm32_gpio_config() static. - moved common.h inclusion before clk.h Changed in v2: - included files in correct order. - moved the pinctrl specific routine from gpio driver to pinctrl - used dev_get_addr() instead of fdtdec_get_addr_size_auto_parent() in gpio driver. - pointed gpio name to bank name in device tree blob rather than copy. Vikas Manocha (18): stm32f7: use clock driver to enable qspi controller clock stm32f7: sdram: move sdram driver code to ram drivers area stm32f7: dm: add driver model support for sdram ARM: DT: stm32f7: add sdram pin contol node stm32f7: use driver model for sdram initialization stm32f7: use clock driver to enable sdram controller clock stm32f7: sdram: use sdram device tree node to configure sdram controller dm: gpio: Add driver for stm32f7 gpio controller ARM: DT: stm32f7: add gpio device tree nodes stm32f7: use stm32f7 gpio driver supporting driver model stm32f746: to switch on user LED1 & read user button stm32f7: stm32f746-disco: read memory info from device tree stm32f7: enable board info read from device tree stm32f7: sdram: correct sdram configuration as per micron sdram stm32f7: increase the max no of pin configuration to 70 stm32f7: move board specific pin muxing to dts stm32f7: add support for stm32f769 disco board stm32f7: remove not needed configuration from board config arch/arm/dts/Makefile | 3 +- arch/arm/dts/stm32f746-disco.dts | 132 ++++++++++++ arch/arm/dts/stm32f746.dtsi | 151 ++++++++++--- arch/arm/dts/stm32f769-disco.dts | 255 ++++++++++++++++++++++ arch/arm/include/asm/arch-stm32f7/gpio.h | 21 +- board/st/stm32f746-disco/stm32f746-disco.c | 299 ++++++-------------------- configs/stm32f746-disco_defconfig | 6 + doc/device-tree-bindings/ram/st,stm32-fmc.txt | 51 +++++ drivers/clk/clk_stm32f7.c | 39 ---- drivers/gpio/Kconfig | 9 + drivers/gpio/Makefile | 1 + drivers/gpio/stm32f7_gpio.c | 135 ++++++++++++ drivers/pinctrl/pinctrl_stm32.c | 50 ++++- drivers/ram/Kconfig | 8 + drivers/ram/Makefile | 1 + drivers/ram/stm32_sdram.c | 179 +++++++++++++++ drivers/spi/stm32_qspi.c | 16 +- include/configs/stm32f746-disco.h | 11 +- include/dt-bindings/memory/stm32-sdram.h | 37 ++++ 19 files changed, 1076 insertions(+), 328 deletions(-) create mode 100644 arch/arm/dts/stm32f769-disco.dts create mode 100644 doc/device-tree-bindings/ram/st,stm32-fmc.txt create mode 100644 drivers/gpio/stm32f7_gpio.c create mode 100644 drivers/ram/stm32_sdram.c create mode 100644 include/dt-bindings/memory/stm32-sdram.h -- 1.9.1

3 38

[U-Boot] [PATCH] spl: make image arg or fdt blob address reconfigurable
by Vikas Manocha 08 May '17

08 May '17

At present fdt blob or argument address being passed to kernel is fixed at compile time using macro CONFIG_SYS_SPL_ARGS_ADDR. FDT blob from different media like nand, nor flash are copied to the address pointed by the macro. The problem is, it makes args/fdt blob compulsory to copy which is not required in cases like for NOR Flash. This patch removes this limitation. Signed-off-by: Vikas Manocha <vikas.manocha(a)st.com> --- arch/arm/lib/spl.c | 7 +++---- arch/microblaze/cpu/spl.c | 6 +++--- arch/powerpc/lib/spl.c | 8 ++++---- common/spl/spl.c | 6 ++++-- common/spl/spl_nor.c | 8 +------- include/spl.h | 5 ++--- 6 files changed, 17 insertions(+), 23 deletions(-) diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index e606d47..8ff2c50 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -44,22 +44,21 @@ void __weak board_init_f(ulong dummy) /* * This function jumps to an image with argument. Normally an FDT or ATAGS * image. - * arg: Pointer to paramter image in RAM */ #ifdef CONFIG_SPL_OS_BOOT -void __noreturn jump_to_image_linux(struct spl_image_info *spl_image, void *arg) +void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) { unsigned long machid = 0xffffffff; #ifdef CONFIG_MACH_TYPE machid = CONFIG_MACH_TYPE; #endif - debug("Entering kernel arg pointer: 0x%p\n", arg); + debug("Entering kernel arg pointer: 0x%p\n", spl_image->arg); typedef void (*image_entry_arg_t)(int, int, void *) __attribute__ ((noreturn)); image_entry_arg_t image_entry = (image_entry_arg_t)(uintptr_t) spl_image->entry_point; cleanup_before_linux(); - image_entry(0, machid, arg); + image_entry(0, machid, spl_image->arg); } #endif diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c index 8e6d926..3d57a5a 100644 --- a/arch/microblaze/cpu/spl.c +++ b/arch/microblaze/cpu/spl.c @@ -29,15 +29,15 @@ void spl_board_init(void) } #ifdef CONFIG_SPL_OS_BOOT -void __noreturn jump_to_image_linux(struct spl_image_info *spl_image, void *arg) +void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) { - debug("Entering kernel arg pointer: 0x%p\n", arg); + debug("Entering kernel arg pointer: 0x%p\n", spl_image->arg); typedef void (*image_entry_arg_t)(char *, ulong, ulong) __attribute__ ((noreturn)); image_entry_arg_t image_entry = (image_entry_arg_t)spl_image->entry_point; - image_entry(NULL, 0, (ulong)arg); + image_entry(NULL, 0, (ulong)spl_image->arg); } #endif /* CONFIG_SPL_OS_BOOT */ diff --git a/arch/powerpc/lib/spl.c b/arch/powerpc/lib/spl.c index 080b978..b931970 100644 --- a/arch/powerpc/lib/spl.c +++ b/arch/powerpc/lib/spl.c @@ -14,18 +14,18 @@ DECLARE_GLOBAL_DATA_PTR; /* * This function jumps to an image with argument. Normally an FDT or ATAGS * image. - * arg: Pointer to paramter image in RAM */ #ifdef CONFIG_SPL_OS_BOOT -void __noreturn jump_to_image_linux(struct spl_image_info *spl_image, void *arg) +void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) { - debug("Entering kernel arg pointer: 0x%p\n", arg); + debug("Entering kernel arg pointer: 0x%p\n", spl_image->arg); typedef void (*image_entry_arg_t)(void *, ulong r4, ulong r5, ulong r6, ulong r7, ulong r8, ulong r9) __attribute__ ((noreturn)); image_entry_arg_t image_entry = (image_entry_arg_t)spl_image->entry_point; - image_entry(arg, 0, 0, EPAPR_MAGIC, CONFIG_SYS_BOOTMAPSZ, 0, 0); + image_entry(spl_image->arg, 0, 0, EPAPR_MAGIC, CONFIG_SYS_BOOTMAPSZ, + 0, 0); } #endif /* CONFIG_SPL_OS_BOOT */ diff --git a/common/spl/spl.c b/common/spl/spl.c index a3e73b8..50828e6 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -345,6 +345,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2) #endif memset(&spl_image, '\0', sizeof(spl_image)); +#ifdef CONFIG_SYS_SPL_ARGS_ADDR + spl_image.arg = (void *)CONFIG_SYS_SPL_ARGS_ADDR; +#endif board_boot_order(spl_boot_list); if (boot_from_devices(&spl_image, spl_boot_list, @@ -361,8 +364,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) case IH_OS_LINUX: debug("Jumping to Linux\n"); spl_board_prepare_for_linux(); - jump_to_image_linux(&spl_image, - (void *)CONFIG_SYS_SPL_ARGS_ADDR); + jump_to_image_linux(&spl_image); #endif default: debug("Unsupported OS image.. Jumping nevertheless..\n"); diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index d07ca84..1ef8ac8 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -39,13 +39,7 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, sizeof(struct image_header)), spl_image->size); - /* - * Copy DT blob (fdt) to SDRAM. Passing pointer to - * flash doesn't work - */ - memcpy((void *)CONFIG_SYS_SPL_ARGS_ADDR, - (void *)(CONFIG_SYS_FDT_BASE), - CONFIG_SYS_FDT_SIZE); + spl_image->arg = (void *)CONFIG_SYS_FDT_BASE; return 0; } else { diff --git a/include/spl.h b/include/spl.h index 2e5b885..d1638e9 100644 --- a/include/spl.h +++ b/include/spl.h @@ -27,6 +27,7 @@ struct spl_image_info { ulong entry_point; u32 size; u32 flags; + void *arg; }; /* @@ -106,10 +107,8 @@ int spl_board_ubi_load_image(u32 boot_device); * This jumps into a Linux kernel using the information in @spl_image. * * @spl_image: Image description to set up - * @arg: Argument to pass to Linux (typically a device tree pointer) */ -void __noreturn jump_to_image_linux(struct spl_image_info *spl_image, - void *arg); +void __noreturn jump_to_image_linux(struct spl_image_info *spl_image); /** * spl_start_uboot() - Check if SPL should start the kernel or U-Boot -- 1.9.1

3 7