July 2018 - U-Boot

[U-Boot] [RFC] env: Fix errors printing on env loading
by Sam Protsenko 19 Jul '18

19 Jul '18

This is just a draft to discuss ideas related to "Make U-Boot log great again" thread. With this patch we will have something like this: Attempting to load environment from FAT: MMC: no card present ** Bad device mmc 0 ** Failed (-5) Attempting to load environment from MMC: OK instead of this: Loading Environment from FAT... MMC: no card present ** Bad device mmc 0 ** Failed (-5) Loading Environment from MMC... OK The only way I see to do so is to use ASCII escape codes for moving the cursor (in non-error case). I'd also like to add prefixes to error messages, like it's done in [2], but it requires adding one pointer to global data struct. [1] https://en.wikipedia.org/wiki/ANSI_escape_code#CSI_sequences [2] https://lists.denx.de/pipermail/u-boot/2018-July/335072.html Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- env/env.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/env/env.c b/env/env.c index 5c0842ac07..a674ac2eab 100644 --- a/env/env.c +++ b/env/env.c @@ -187,6 +187,7 @@ int env_load(void) for (prio = 0; (drv = env_driver_lookup(ENVOP_LOAD, prio)); prio++) { int ret; + char msg[75]; if (!drv->load) continue; @@ -194,12 +195,17 @@ int env_load(void) if (!env_has_inited(drv->location)) continue; - printf("Loading Environment from %s... ", drv->name); + snprintf(msg, 75, "Attempting to load environment from %s:\n", + drv->name); + puts(msg); ret = drv->load(); - if (ret) + if (ret) { printf("Failed (%d)\n", ret); - else - printf("OK\n"); + } else { + size_t len = strlen(msg); + + printf("\033[1A\033[%zuC OK\n", len - 1); + } if (!ret) return 0; -- 2.18.0

2 1

[U-Boot] [PATCH 00/13] Allwinner H6 support (w/ SPL)
by Icenowy Zheng 19 Jul '18

19 Jul '18

This patch trys to add support for Allwinner H6 SoC to U-Boot. Allwinner H6 is a quite new Allwinner SoC, with several parts changed a lot (memory map, DRAM controller, CCU, so on). The position which SPL will be loaded (SRAM A1) also changed to 0x20000. The Pine H64 board support comes with this patchset, as this is the first H6 board that I can get (being early bird). Icenowy Zheng (13): sunxi: change SUNXI_HIGH_SRAM option to SUNXI_SRAM_ADDRESS sunxi: add basical memory map definitions of H6 SoC sunxi: change RMR64's RVBAR address for H6 sunxi: change ATF position for H6 sunxi: add config for SPL at 0x20000 on H6 sunxi: change GIC address on H6 sunxi: add clock code for H6 sunxi: use sun6i-style watchdog for H6 sunxi: add UART0 setup for H6 sunxi: add MMC support for H6 sunxi: add DRAM support to H6 sunxi: add support for Allwinner H6 SoC sunxi: add support for Pine H64 board arch/arm/dts/Makefile | 2 + arch/arm/dts/sun50i-h6-pine-h64.dts | 64 ++ arch/arm/dts/sun50i-h6.dtsi | 140 ++++ arch/arm/include/asm/arch-sunxi/boot0.h | 4 + arch/arm/include/asm/arch-sunxi/clock.h | 2 + .../include/asm/arch-sunxi/clock_sun50i_h6.h | 320 ++++++++ arch/arm/include/asm/arch-sunxi/cpu.h | 2 + .../include/asm/arch-sunxi/cpu_sun50i_h6.h | 73 ++ arch/arm/include/asm/arch-sunxi/dram.h | 2 + .../include/asm/arch-sunxi/dram_sun50i_h6.h | 276 +++++++ arch/arm/include/asm/arch-sunxi/gpio.h | 1 + arch/arm/include/asm/arch-sunxi/mmc.h | 2 +- arch/arm/include/asm/arch-sunxi/spl.h | 6 +- arch/arm/include/asm/arch-sunxi/timer.h | 2 +- arch/arm/mach-sunxi/Kconfig | 37 +- arch/arm/mach-sunxi/Makefile | 2 + arch/arm/mach-sunxi/board.c | 6 +- arch/arm/mach-sunxi/clock_sun50i_h6.c | 94 +++ arch/arm/mach-sunxi/cpu_info.c | 2 + arch/arm/mach-sunxi/dram_sun50i_h6.c | 708 ++++++++++++++++++ arch/arm/mach-sunxi/rmr_switch.S | 6 + board/sunxi/MAINTAINERS | 5 + board/sunxi/board.c | 7 + board/sunxi/mksunxi_fit_atf.sh | 10 +- common/spl/Kconfig | 2 +- configs/pine_h64_defconfig | 15 + drivers/mmc/sunxi_mmc.c | 13 +- include/configs/sun50i.h | 5 + include/configs/sunxi-common.h | 24 +- 29 files changed, 1802 insertions(+), 30 deletions(-) create mode 100644 arch/arm/dts/sun50i-h6-pine-h64.dts create mode 100644 arch/arm/dts/sun50i-h6.dtsi create mode 100644 arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h create mode 100644 arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h create mode 100644 arch/arm/mach-sunxi/clock_sun50i_h6.c create mode 100644 arch/arm/mach-sunxi/dram_sun50i_h6.c create mode 100644 configs/pine_h64_defconfig -- 2.17.1

4 35

[U-Boot] [PATCH v4 0/1] Xilinx Axi Watchdog driver conversion to driver model
by Michal Simek 19 Jul '18

19 Jul '18

Hi, this is moving MB watchdog to DM. I have taken v2 from Shreenidhi and did some changes to speedup upstreaming because I need this for my gpio work. Removing watchdog in the first patch is not big deal because this is generic platform and adresses are fake. Sending only last patch because the rest was already applied and there are patches which depends on that. Thanks, Michal Changes in v4: - Fix Kconfig typo - by sjg - Use debug instead of puts in drivers - by sjg - Use EBUSY instead of -1 - by sjg Changes in v3: - Fix commit message - s/Axi/AXI - Use platdata instead of private data. - Remove \n from wdt reset to catch logs - Add debug to wdt_start Changes in v2: - Rectified print message - Removed stop instruction from probe Changes in v1: - Xilinx Axi wdt driver conversion to DM initial version Shreenidhi Shedi (1): watchdog: Convert Xilinx Axi watchdog driver to driver model drivers/watchdog/Kconfig | 8 +++ drivers/watchdog/xilinx_tb_wdt.c | 111 ++++++++++++++++++++++++++++++--------- 2 files changed, 93 insertions(+), 26 deletions(-) -- 1.9.1

2 2

[U-Boot] [RFC PATCH 00/15] cmd: fpga: Fix fpga command handling and add some fpga tests
by Michal Simek 19 Jul '18

19 Jul '18

Hi, We are using this framework for a while and by adding more and more features it requires small redesigned how commands are handled. This is something what I have put together to improve readability of this code and also remove code which is bogus and completely untested. The series depends on these patches. https://lists.denx.de/pipermail/u-boot/2018-June/332487.html https://lists.denx.de/pipermail/u-boot/2018-June/332488.html https://lists.denx.de/pipermail/u-boot/2018-June/330651.html I am sending this as RFC to get a feedback on these changes. I have rebased it on the latest tree and need to run another testing round again. Thanks, Michal Michal Simek (15): test/py: Extend fpga command to test all fpga load types cmd: fpga: Move error handling to do_fpga() cmd: fpga: Move fpga_get_op to avoid local function declaration cmd: fpga: Cleanup error handling in connection to FPGA_NONE cmd: fpga: Move parameter checking for loadfs/loads cmd: fpga: Remove parameter checking from fpga loadfs command cmd: fpga: Clean wrong_parms handling cmd: fpga: Create new do_fpga_wrapper for using u-boot subcommands cmd: fpga: Extract fpga info command to separate function cmd: fpga: Fix dump and all direct fpga load commands cmd: fpga: Fix loadfs command cmd: fpga: Fix loadmk command cmd: fpga: Use CMD_RET_FAILURE instead of simple 1 cmd: fpga: Fix loads command MAINTAINERS: Add myself as the FPGA maintainer MAINTAINERS | 8 + cmd/fpga.c | 606 ++++++++++++++++++++++++--------------------- test/py/tests/test_fpga.py | 516 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 843 insertions(+), 287 deletions(-) create mode 100644 test/py/tests/test_fpga.py -- 1.9.1

2 29

[U-Boot] Issue with fat16 format
by Vipul Kumar 19 Jul '18

19 Jul '18

Hi, After formatting SD card in fat16 format in windows, we are facing issue. I used git bisect and came to know that this issue is due to 8eafae209c35932d9a6560809c55ee4641534236 commit. When we use "gparted" utility for formatting SD card in fat16 in linux, it works fine. Please give your comments on this issue and point out what's causing this issue. Regards, Vipul Kumar This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

3 3

[U-Boot] [PATCH v6 0/5] Add support for reading memory configuration from DT at run-time
by Michal Simek 19 Jul '18

19 Jul '18

Hi, this is series which was send by Siva. I have just put there missing Tom's tag which we got and adding more people to TO. Thanks, Michal Changes in v6: - Fix socfpga misc, bcmstb, ebisu which were recently added Changes in v5: - Add Tom's tag - https://lists.denx.de/pipermail/u-boot/2018-June/332810.html - Add Tom's tag - https://lists.denx.de/pipermail/u-boot/2018-June/332810.html Changes in v4: - Rebased on latest master and used available ram_base - Separate the rename patch - Rebased on latest master - None, rebased on latest master Changes in v3: - Used new varibale ram_start - Rename fdtdec_setup_memory_size Changes in v2: - Removed commit reference from description as per comment - Update memory node as per comment - Removed intc and fclk as per comment Siva Durga Prasad Paladugu (5): lib: fdtdec: Update ram_base to store ram start adddress lib: fdtdec: Rename routine fdtdec_setup_memory_size() arm: zynq: Dont define SDRAM_BASE and SDRAM_SIZE in .h arm: zynq: Add Nand flash mini u-boot configuration for zynq arm: zynq: Add parallel NOR flash mini u-boot configuration for zynq arch/arm/dts/Makefile | 2 + arch/arm/dts/zynq-cse-nand.dts | 80 ++++++++++++++++++++ arch/arm/dts/zynq-cse-nor.dts | 88 ++++++++++++++++++++++ arch/arm/mach-mvebu/arm64-common.c | 2 +- arch/arm/mach-socfpga/misc.c | 2 +- board/broadcom/bcmstb/bcmstb.c | 2 +- board/emulation/qemu-arm/qemu-arm.c | 2 +- board/renesas/alt/alt.c | 2 +- board/renesas/blanche/blanche.c | 2 +- board/renesas/draak/draak.c | 2 +- board/renesas/eagle/eagle.c | 2 +- board/renesas/ebisu/ebisu.c | 2 +- board/renesas/gose/gose.c | 2 +- board/renesas/koelsch/koelsch.c | 2 +- board/renesas/lager/lager.c | 2 +- board/renesas/porter/porter.c | 2 +- board/renesas/salvator-x/salvator-x.c | 2 +- board/renesas/silk/silk.c | 2 +- board/renesas/stout/stout.c | 2 +- board/renesas/ulcb/ulcb.c | 2 +- board/st/stm32f429-discovery/stm32f429-discovery.c | 2 +- .../st/stm32f429-evaluation/stm32f429-evaluation.c | 2 +- board/st/stm32f469-discovery/stm32f469-discovery.c | 2 +- board/st/stm32h743-disco/stm32h743-disco.c | 2 +- board/st/stm32h743-eval/stm32h743-eval.c | 2 +- board/xilinx/zynq/board.c | 2 +- board/xilinx/zynqmp/zynqmp.c | 2 +- board/xilinx/zynqmp_r5/board.c | 2 +- common/board_f.c | 4 +- configs/zynq_cse_nand_defconfig | 50 ++++++++++++ configs/zynq_cse_nor_defconfig | 50 ++++++++++++ include/configs/zynq_cse.h | 3 - include/fdtdec.h | 16 ++-- lib/fdtdec.c | 3 +- tools/patman/func_test.py | 2 +- tools/patman/test/0000-cover-letter.patch | 2 +- ...-cast-for-sandbox-in-fdtdec_setup_memory_.patch | 4 +- tools/patman/test/test01.txt | 2 +- 38 files changed, 313 insertions(+), 43 deletions(-) create mode 100644 arch/arm/dts/zynq-cse-nand.dts create mode 100644 arch/arm/dts/zynq-cse-nor.dts create mode 100644 configs/zynq_cse_nand_defconfig create mode 100644 configs/zynq_cse_nor_defconfig -- 1.9.1

2 6

[U-Boot] [PATCH] arm: zynq: Setup ENV_SIZE via Kconfig
by Michal Simek 19 Jul '18

19 Jul '18

Simplify zynq_cse config by setting up ENV_SIZE via Kconfig. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Based on: https://lists.denx.de/pipermail/u-boot/2018-July/335126.html --- configs/zynq_cse_nand_defconfig | 1 + configs/zynq_cse_nor_defconfig | 1 + configs/zynq_cse_qspi_defconfig | 1 + include/configs/zynq_cse.h | 2 -- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/zynq_cse_nand_defconfig b/configs/zynq_cse_nand_defconfig index dcd4eda3ca3a..eb7e574040af 100644 --- a/configs/zynq_cse_nand_defconfig +++ b/configs/zynq_cse_nand_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="zynq_cse" CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0x100000 +CONFIG_ENV_SIZE=0x190 CONFIG_SPL=y CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nand" diff --git a/configs/zynq_cse_nor_defconfig b/configs/zynq_cse_nor_defconfig index 9e2546b19785..95b31a0be66f 100644 --- a/configs/zynq_cse_nor_defconfig +++ b/configs/zynq_cse_nor_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="zynq_cse" CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0xFFFC0000 +CONFIG_ENV_SIZE=0x190 CONFIG_SPL=y CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nor" diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig index df6ebdc03a28..c094a5e7de48 100644 --- a/configs/zynq_cse_qspi_defconfig +++ b/configs/zynq_cse_qspi_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_CONFIG_NAME="zynq_cse" CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0xFFFC0000 +CONFIG_ENV_SIZE=0x190 CONFIG_SPL=y CONFIG_DEBUG_UART_BASE=0x0 CONFIG_DEBUG_UART_CLOCK=0 diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index adc02f0a4a3b..36fbe0eb5e2d 100644 --- a/include/configs/zynq_cse.h +++ b/include/configs/zynq_cse.h @@ -18,7 +18,6 @@ /* Undef unneeded configs */ #undef CONFIG_EXTRA_ENV_SETTINGS #undef CONFIG_BOARD_LATE_INIT -#undef CONFIG_ENV_SIZE #undef CONFIG_ZLIB #undef CONFIG_GZIP @@ -28,7 +27,6 @@ #define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_ENV_SIZE 400 #undef CONFIG_SYS_INIT_RAM_ADDR #undef CONFIG_SYS_INIT_RAM_SIZE #define CONFIG_SYS_INIT_RAM_ADDR 0xFFFDE000 -- 1.9.1

2 1

[U-Boot] [PATCH 1/3] spl: fit: display a message when an FPGA image is loaded
by Luis Araneda 19 Jul '18

19 Jul '18

A message should be displayed if an image is loaded to an FPGA, because the hardware might have changed, and the user should be informed Signed-off-by: Luis Araneda <luaraneda(a)gmail.com> --- common/spl/spl_fit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 5b51a28a08..9eabb1c105 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -412,6 +412,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, printf("%s: Cannot load the FPGA: %i\n", __func__, ret); return ret; } + puts("FPGA image loaded from FIT\n"); node = -1; } #endif -- 2.18.0

2 3

[U-Boot] [PATCH v2 0/3] Xilinx Axi Watchdog driver conversion to driver model
by Shreenidhi Shedi 19 Jul '18

19 Jul '18

[PATCH 1/3] Removed a bunch of WATCHDOG related macros [PATCH 2/3] Support for watchdog_reset function for Microblaze init [PATCH 3/3] Xilinx Axi watchdog driver to driver model Changes in v2: - Appropriate commit messages for each patch - Cosmetic changes patch is taken out - Changes in xilinx_tb_wdt.c based on review comments Shreenidhi Shedi (3): microblaze: Delete Xilinx watchdog related macros microblaze: Support for watchdog_reset in Microblaze init watchdog: Convert Xilinx Axi watchdog driver to driver model .../microblaze-generic/microblaze-generic.c | 42 ++++++- board/xilinx/microblaze-generic/xparameters.h | 4 - drivers/watchdog/Kconfig | 8 ++ drivers/watchdog/xilinx_tb_wdt.c | 105 ++++++++++++++---- include/configs/microblaze-generic.h | 10 -- 5 files changed, 127 insertions(+), 42 deletions(-) -- 2.17.1

3 6

[U-Boot] [PATCH v3] env: Added support to save env to spi through Kconfig
by Michal Simek 19 Jul '18

19 Jul '18

From: Vipul Kumar <vipul.kumar(a)xilinx.com> This patch added support to enable CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET and CONFIG_ENV_SECT_SIZE through Kconfig for Zynq and Zynqmp. Signed-off-by: Vipul Kumar <vipul.kumar(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v3: - Fix also bitmain config which was failing Changes in v2: - Changed if condition of ENV_SIZE for Zynqmp - Changed if condition for ENV_SECT_SIZE configs/bitmain_antminer_s9_defconfig | 1 + env/Kconfig | 28 ++++++++++++++++++++++++++++ include/configs/bitmain_antminer_s9.h | 3 --- include/configs/xilinx_zynqmp.h | 3 --- include/configs/zynq-common.h | 13 ------------- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/configs/bitmain_antminer_s9_defconfig b/configs/bitmain_antminer_s9_defconfig index 40bce4e37482..f59c767242f1 100644 --- a/configs/bitmain_antminer_s9_defconfig +++ b/configs/bitmain_antminer_s9_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_BOARD="antminer_s9" CONFIG_SYS_CONFIG_NAME="bitmain_antminer_s9" CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0x4000000 +CONFIG_ENV_OFFSET=0x300000 CONFIG_SPL=y CONFIG_DEBUG_UART_BASE=0xe0001000 CONFIG_DEBUG_UART_CLOCK=50000000 diff --git a/env/Kconfig b/env/Kconfig index 8618376f252f..b37dcd78eb75 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -480,6 +480,34 @@ config ENV_SIZE endif +if ARCH_ZYNQMP || ARCH_ZYNQ + +config ENV_OFFSET + hex "Environment Offset" + depends on !ENV_IS_NOWHERE + default 0x1E00000 if ARCH_ZYNQMP + default 0xE0000 if ARCH_ZYNQ + help + Offset from the start of the device (or partition) + +config ENV_SIZE + hex "Environment Size" + default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP + default 0x8000 if ARCH_ZYNQMP + default 0x20000 if ARCH_ZYNQ + help + Size of the environment storage area. + +config ENV_SECT_SIZE + hex "Environment Sector-Size" + depends on !ENV_IS_NOWHERE + default 0x40000 if ARCH_ZYNQMP + default 0x20000 if ARCH_ZYNQ + help + Size of the sector containing the environment. + +endif + config USE_DEFAULT_ENV_FILE bool "Create default environment from file" help diff --git a/include/configs/bitmain_antminer_s9.h b/include/configs/bitmain_antminer_s9.h index 226750215e75..a9f45f19295a 100644 --- a/include/configs/bitmain_antminer_s9.h +++ b/include/configs/bitmain_antminer_s9.h @@ -9,9 +9,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_SIZE 0x40000000 -#define CONFIG_ENV_SIZE 0x20000 -#define CONFIG_ENV_OFFSET 0x300000 - #define CONFIG_BOOTP_SERVERIP #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index ebc6c6f3e020..ef242c796253 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -99,9 +99,6 @@ # define PARTS_DEFAULT #endif -/* Do not preserve environment */ -#define CONFIG_ENV_SIZE 0x8000 - /* Monitor Command Prompt */ /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 2048 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index a6f2aceea1de..c41dc2c9070e 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -121,22 +121,9 @@ # define CONFIG_SYS_EEPROM_SIZE 1024 /* Bytes */ #endif -/* Total Size of Environment Sector */ -#ifndef CONFIG_ENV_SIZE -# define CONFIG_ENV_SIZE (128 << 10) -#endif - /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE -/* Environment */ -#ifndef CONFIG_ENV_IS_NOWHERE -# define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE -# ifndef CONFIG_ENV_OFFSET -# define CONFIG_ENV_OFFSET 0xE0000 -# endif -#endif - /* enable preboot to be loaded before CONFIG_BOOTDELAY */ #define CONFIG_PREBOOT -- 1.9.1

2 4