September 2018 - U-Boot

[U-Boot] [PATCH] MAINTAINERS: Update some entries for missed boards
by Tom Rini 30 Sep '18

30 Sep '18

Signed-off-by: Tom Rini <trini(a)konsulko.com> --- board/atmel/sama5d27_som1_ek/MAINTAINERS | 1 + board/atmel/sama5d2_xplained/MAINTAINERS | 1 + board/seeed/linkit-smart-7688/MAINTAINERS | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/board/atmel/sama5d27_som1_ek/MAINTAINERS b/board/atmel/sama5d27_som1_ek/MAINTAINERS index 609583c34146..295639cd3c43 100644 --- a/board/atmel/sama5d27_som1_ek/MAINTAINERS +++ b/board/atmel/sama5d27_som1_ek/MAINTAINERS @@ -4,3 +4,4 @@ S: Maintained F: board/atmel/sama5d27_som1_ek/ F: include/configs/sama5d27_som1_ek.h F: configs/sama5d27_som1_ek_mmc_defconfig +F: configs/sama5d27_som1_ek_mmc1_defconfig diff --git a/board/atmel/sama5d2_xplained/MAINTAINERS b/board/atmel/sama5d2_xplained/MAINTAINERS index ff9c86f53804..5b599d8e57f7 100644 --- a/board/atmel/sama5d2_xplained/MAINTAINERS +++ b/board/atmel/sama5d2_xplained/MAINTAINERS @@ -5,3 +5,4 @@ F: board/atmel/sama5d2_xplained/ F: include/configs/sama5d2_xplained.h F: configs/sama5d2_xplained_mmc_defconfig F: configs/sama5d2_xplained_spiflash_defconfig +F: configs/sama5d2_xplained_emmc_defconfig diff --git a/board/seeed/linkit-smart-7688/MAINTAINERS b/board/seeed/linkit-smart-7688/MAINTAINERS index c3bbad423123..f2186c1b9d72 100644 --- a/board/seeed/linkit-smart-7688/MAINTAINERS +++ b/board/seeed/linkit-smart-7688/MAINTAINERS @@ -4,5 +4,5 @@ S: Maintained F: board/seeed/linkit-smart-7688 F: include/configs/linkit-smart-7688.h F: configs/linkit-smart-7688_defconfig -F: configs/linkit-smart-7688_ram_defconfig +F: configs/linkit-smart-7688-ram_defconfig F: arch/mips/dts/linkit-smart-7688.dts -- 2.7.4

1 1

[U-Boot] [PATCH] serial: serial_stm32: Enable uart FIFO for STM32F7xx SoCs
by Patrice Chotard 30 Sep '18

30 Sep '18

Since commit 7b3b74d32127 ("serial: serial_stm32: Enable overrun") on STM32F7xx based boards, the first lines of serial output are missing during boot (we no more see the U-Boot release version, board model and DRAM size). By enabling the uart FIFO on STM32F7, the complete U-boot log can be sent correctly. Signed-off-by: Patrice Chotard <patrice.chotard(a)st.com> --- drivers/serial/serial_stm32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/serial/serial_stm32.h b/drivers/serial/serial_stm32.h index ccafa31219a1..5549f8c5368a 100644 --- a/drivers/serial/serial_stm32.h +++ b/drivers/serial/serial_stm32.h @@ -37,7 +37,7 @@ struct stm32_uart_info stm32f4_info = { struct stm32_uart_info stm32f7_info = { .uart_enable_bit = 0, .stm32f4 = false, - .has_fifo = false, + .has_fifo = true, }; struct stm32_uart_info stm32h7_info = { -- 1.9.1

2 1

[U-Boot] [PATCH] u-boot: align cache flushes in load_elf_image_shdr to line boundaries
by Neil Stainton 30 Sep '18

30 Sep '18

Prevent cache warning messages when using the 'bootelf' command on an Arm target. Round down each section start address and round up the respective section end to the nearest cache line. Signed-off-by: Neil Stainton <nstainton(a)asl-control.co.uk> --- This is a repeat of commit 8744d6c5 as this file changed significantly between patch submission and the patch being applied. --- cmd/elf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/elf.c b/cmd/elf.c index eafea38..1199e5d 100644 --- a/cmd/elf.c +++ b/cmd/elf.c @@ -141,7 +141,9 @@ static unsigned long load_elf_image_shdr(unsigned long addr) memcpy((void *)(uintptr_t)shdr->sh_addr, (const void *)image, shdr->sh_size); } - flush_cache(shdr->sh_addr, shdr->sh_size); + flush_cache(rounddown(shdr->sh_addr, ARCH_DMA_MINALIGN), + roundup((shdr->sh_addr + shdr->sh_size), ARCH_DMA_MINALIGN) - + rounddown(shdr->sh_addr, ARCH_DMA_MINALIGN)); } return ehdr->e_entry; -- 2.7.4

2 1

[U-Boot] [PATCH 0/2] Fix build with the latest GNU Make
by Masahiro Yamada 30 Sep '18

30 Sep '18

I can not build my board with the lastest GNU Make since it changed the escaping of '#' in function calls. Change the makefiles portable to both old and new GNU Make version. Masahiro Yamada (1): kbuild: fix # escaping in appending U-Boot own DT Rasmus Villemoes (1): Kbuild: fix # escaping in .cmd files for future Make scripts/Kbuild.include | 5 +++-- scripts/Makefile.lib | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) -- 2.7.4

2 4

[U-Boot] [PATCH] spl: mmc: Report device number when we fail
by Alex Kiernan 30 Sep '18

30 Sep '18

If we fail to find the MMC boot device, report the number of the one we were looking for in the error to aid diagnosis. Signed-off-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- common/spl/spl_mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 0b2f059570..39d5ac1530 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -140,7 +140,8 @@ static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device) #endif if (err) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT - printf("spl: could not find mmc device. error: %d\n", err); + printf("spl: could not find mmc device %d. error: %d\n", + mmc_dev, err); #endif return err; } -- 2.17.1

2 1

[U-Boot] [PATCH] cmd: env: Fix CRC calculation for 'env export -c -s'
by Neil Stainton 30 Sep '18

30 Sep '18

Fix failure to reimport exported checksummed, size constrained data block. 'env export -c' command ignores optional -s size argument when calculating checksum causing subsequent 'env import -c' to fail. Signed-off-by: Neil Stainton <nstainton at asl-control.co.uk> --- cmd/nvedit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index ddc888a..600c38b 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -984,7 +984,8 @@ NXTARG: ; } if (chk) { - envp->crc = crc32(0, envp->data, ENV_SIZE); + envp->crc = crc32(0, envp->data, + size ? size - offsetof(env_t, data) : ENV_SIZE); #ifdef CONFIG_ENV_ADDR_REDUND envp->flags = ACTIVE_FLAG; #endif -- 2.7.4

2 1

[U-Boot] [PATCH] arm: new board - Emlid Neutis N5 support
by AD-Aleksandrov 30 Sep '18

30 Sep '18

- add neutis target to dtb makefile - add dts file for Neutis N5 - add config file for Neutis N5 Signed-off-by: Aleksandr Aleksandrov <aleksandr.aleksandrov(a)emlid.com> --- arch/arm/dts/Makefile | 3 +- arch/arm/dts/sun50i-h5-emlid-neutis-n5.dts | 90 ++++++++++++++++++++++++++++++ configs/emlid_neutis_n5_defconfig | 13 +++++ 3 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/sun50i-h5-emlid-neutis-n5.dts create mode 100644 configs/emlid_neutis_n5_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 44ebc50..3e49d72 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -391,7 +391,8 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \ sun50i-h5-orangepi-zero-plus.dtb \ sun50i-h5-orangepi-pc2.dtb \ sun50i-h5-orangepi-prime.dtb \ - sun50i-h5-orangepi-zero-plus2.dtb + sun50i-h5-orangepi-zero-plus2.dtb \ + sun50i-h5-emlid-neutis-n5.dtb dtb-$(CONFIG_MACH_SUN50I_H6) += \ sun50i-h6-orangepi-one-plus.dtb \ sun50i-h6-pine-h64.dtb diff --git a/arch/arm/dts/sun50i-h5-emlid-neutis-n5.dts b/arch/arm/dts/sun50i-h5-emlid-neutis-n5.dts new file mode 100644 index 0000000..deb6e76 --- /dev/null +++ b/arch/arm/dts/sun50i-h5-emlid-neutis-n5.dts @@ -0,0 +1,90 @@ +/*s + * Copyright (C) 2018 Aleksandr Aleksandrov <aleksandr.aleksandrov(a)emlid.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; + +#include "sun50i-h5.dtsi" + +#include <dt-bindings/gpio/gpio.h> + +/ { + model = "Emlid Neutis N5"; + compatible = "emlid,neutis-n5", "allwinner,sun50i-h5"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + reg_vcc3v3: vcc3v3 { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +}; + +&mmc0 { + vmmc-supply = <&reg_vcc3v3>; + bus-width = <4>; + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + status = "okay"; +}; + +&mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_8bit_pins>; + vmmc-supply = <&reg_vcc3v3>; + bus-width = <8>; + non-removable; + cap-mmc-hw-reset; + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; + status = "okay"; +}; diff --git a/configs/emlid_neutis_n5_defconfig b/configs/emlid_neutis_n5_defconfig new file mode 100644 index 0000000..5d6554c --- /dev/null +++ b/configs/emlid_neutis_n5_defconfig @@ -0,0 +1,13 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_SPL=y +CONFIG_MACH_SUN50I_H5=y +CONFIG_DRAM_CLK=408 +CONFIG_DRAM_ZQ=3881977 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_NR_DRAM_BANKS=1 +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-emlid-neutis-n5" -- 2.7.4

2 1

[U-Boot] Please pull u-boot-video/master
by Anatolij Gustschin 30 Sep '18

30 Sep '18

Hi Tom, The following changes since commit bbef20d479441b01d62252cf127498c58078b2c3: Merge tag 'xilinx-for-v2018.11' of git://git.denx.de/u-boot-microblaze (2018-09-27 08:29:10 -0400) are available in the Git repository at: git://git.denx.de/u-boot-video.git master for you to fetch changes up to c1a65a8c598d27379db91cd47d30103d76311398: video: Add support for Arm's Mali Display Processors (2018-09-28 19:11:44 +0200) ---------------------------------------------------------------- Heinrich Schuchardt (3): MAINTAINERS: assign include/video*.h dm: video: adjust struct vidconsole_priv description dm: video: support more escape sequences Liviu Dudau (3): include/video.h: Remove declaration of functions that don't exist. video: Add support for NXP's TDA19988 HDMI encoder video: Add support for Arm's Mali Display Processors Mario Six (6): drivers: Add OSD uclass video_osd: Add ihs_video_out driver video_osd: Add osd sandbox driver and tests test: Add ut_asserteq_mem test: list: Add tests for hexdump.c cmd: Add osd commands Sébastien Szymanski (1): video: cfb_console: flush cache in display_rle8_bitmap MAINTAINERS | 12 + arch/sandbox/dts/test.dts | 5 + arch/sandbox/include/asm/test.h | 8 + board/gdsys/common/Makefile | 4 + board/gdsys/common/osd_cmd.c | 146 +++++ board/gdsys/mpc8308/Kconfig | 11 + cmd/Kconfig | 8 + cmd/Makefile | 1 + cmd/osd.c | 291 +++++++++ configs/sandbox64_defconfig | 3 + configs/sandbox_defconfig | 3 + configs/sandbox_flattree_defconfig | 3 + configs/sandbox_noblk_defconfig | 3 + configs/sandbox_spl_defconfig | 3 + .../video/osd/gdsys,ihs_video_out.txt | 23 + drivers/video/Kconfig | 39 ++ drivers/video/Makefile | 5 + drivers/video/cfb_console.c | 4 + drivers/video/ihs_video_out.c | 341 +++++++++++ drivers/video/mali_dp.c | 405 +++++++++++++ drivers/video/sandbox_osd.c | 161 +++++ drivers/video/sandbox_osd.h | 13 + drivers/video/tda19988.c | 653 +++++++++++++++++++++ drivers/video/vidconsole-uclass.c | 75 ++- drivers/video/video_osd-uclass.c | 45 ++ include/dm/uclass-id.h | 1 + include/test/ut.h | 18 + include/video.h | 6 - include/video_console.h | 28 +- include/video_osd.h | 192 ++++++ test/Makefile | 1 + test/dm/Makefile | 1 + test/dm/osd.c | 210 +++++++ test/lib/Makefile | 5 + test/lib/hexdump.c | 95 +++ 35 files changed, 2791 insertions(+), 31 deletions(-) create mode 100644 board/gdsys/common/osd_cmd.c create mode 100644 cmd/osd.c create mode 100644 doc/device-tree-bindings/video/osd/gdsys,ihs_video_out.txt create mode 100644 drivers/video/ihs_video_out.c create mode 100644 drivers/video/mali_dp.c create mode 100644 drivers/video/sandbox_osd.c create mode 100644 drivers/video/sandbox_osd.h create mode 100644 drivers/video/tda19988.c create mode 100644 drivers/video/video_osd-uclass.c create mode 100644 include/video_osd.h create mode 100644 test/dm/osd.c create mode 100644 test/lib/Makefile create mode 100644 test/lib/hexdump.c Build logs: https://travis-ci.org/vdsao/u-boot-video/builds/434718521 Please pull. Thanks! Anatolij

2 1

[U-Boot] [PATCH 1/1] efi_loader: fix typo in efi_boottime.c
by Heinrich Schuchardt 30 Sep '18

30 Sep '18

%s/conncected/connected/ Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_boottime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 4c51bb314d..0f98a90134 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -2637,7 +2637,7 @@ static efi_status_t efi_protocol_open( if (item->info.attributes & EFI_OPEN_PROTOCOL_BY_DRIVER) opened_by_driver = true; } - /* Only one controller can be conncected */ + /* Only one controller can be connected */ if (opened_by_driver) return EFI_ACCESS_DENIED; } -- 2.19.0

1 0

[U-Boot] [PATCH] arm: socfpga: stratix10: Add generic FPGA reconfig mailbox API for S10
by chee.hong.ang＠intel.com 30 Sep '18

30 Sep '18

From: "Ang, Chee Hong" <chee.hong.ang(a)intel.com> Add a generic mailbox API for FPGA reconfig status which can be called by others. This new function accepts 2 different mailbox commands: CONFIG_STATUS or RECONFIG_STATUS. Signed-off-by: Ang, Chee Hong <chee.hong.ang(a)intel.com> --- arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 3 +- arch/arm/mach-socfpga/mailbox_s10.c | 48 ++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-socfpga/include/mach/mailbox_s10.h b/arch/arm/mach-socfpga/include/mach/mailbox_s10.h index 81a609d..660df35 100644 --- a/arch/arm/mach-socfpga/include/mach/mailbox_s10.h +++ b/arch/arm/mach-socfpga/include/mach/mailbox_s10.h @@ -140,5 +140,6 @@ int mbox_qspi_open(void); #endif int mbox_reset_cold(void); - +int mbox_get_fpga_config_status(u32 cmd); +int mbox_get_fpga_config_status_psci(u32 cmd); #endif /* _MAILBOX_S10_H_ */ diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c index 0d906c3..345485c 100644 --- a/arch/arm/mach-socfpga/mailbox_s10.c +++ b/arch/arm/mach-socfpga/mailbox_s10.c @@ -342,6 +342,54 @@ int mbox_reset_cold(void) return 0; } +/* Accepted commands: CONFIG_STATUS or RECONFIG_STATUS */ +static __always_inline int mbox_get_fpga_config_status_common(u32 cmd) +{ + u32 reconfig_status_resp_len; + u32 reconfig_status_resp[RECONFIG_STATUS_RESPONSE_LEN]; + int ret; + + reconfig_status_resp_len = RECONFIG_STATUS_RESPONSE_LEN; + ret = mbox_send_cmd_common(MBOX_ID_UBOOT, cmd, + MBOX_CMD_DIRECT, 0, NULL, 0, + &reconfig_status_resp_len, + reconfig_status_resp); + if (!ret) { + /* Check for any error */ + ret = reconfig_status_resp[RECONFIG_STATUS_STATE]; + if (ret && ret != MBOX_CFGSTAT_STATE_CONFIG) + return ret; + + /* Make sure nStatus is not 0 */ + ret = reconfig_status_resp[RECONFIG_STATUS_PIN_STATUS]; + if (!(ret & RCF_PIN_STATUS_NSTATUS)) + return MBOX_CFGSTAT_STATE_ERROR_HARDWARE; + + ret = reconfig_status_resp[RECONFIG_STATUS_SOFTFUNC_STATUS]; + if (ret & RCF_SOFTFUNC_STATUS_SEU_ERROR) + return MBOX_CFGSTAT_STATE_ERROR_HARDWARE; + + if ((ret & RCF_SOFTFUNC_STATUS_CONF_DONE) && + (ret & RCF_SOFTFUNC_STATUS_INIT_DONE) && + !reconfig_status_resp[RECONFIG_STATUS_STATE]) + return 0; /* configuration success */ + else + return MBOX_CFGSTAT_STATE_CONFIG; + } + + return ret; +} + +int mbox_get_fpga_config_status(u32 cmd) +{ + return mbox_get_fpga_config_status_common(cmd); +} + +int __secure mbox_get_fpga_config_status_psci(u32 cmd) +{ + return mbox_get_fpga_config_status_common(cmd); +} + int mbox_send_cmd(u8 id, u32 cmd, u8 is_indirect, u32 len, u32 *arg, u8 urgent, u32 *resp_buf_len, u32 *resp_buf) { -- 2.7.4

3 7