February 2020 - U-Boot

[PATCH v2] cmd: Handle CONFIG_(SPL_|TPL_)ENV_SUPPORT for toggling nvedit object
by Nathan Rossi 02 Feb '20

02 Feb '20

When CONFIG_SPL_ENV_SUPPORT is disabled, nvedit was still being included as part of the build. Use the CONFIG_ENV_SUPPORT, CONFIG_SPL_ENV_SUPPORT or CONFIG_TPL_ENV_SUPPORT values to enable/disable the inclusion of nvedit. Signed-off-by: Nathan Rossi <nathan(a)nathanrossi.com> --- Changes in v2: * Changed $(SPL_) to $(SPL_TPL_) to cover CONFIG_TPL_ENV_SUPPORT --- cmd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/Makefile b/cmd/Makefile index 4f29b72c69..21b867d3a9 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -186,7 +186,7 @@ endif # !CONFIG_SPL_BUILD obj-$(CONFIG_$(SPL_)CMD_TLV_EEPROM) += tlv_eeprom.o # core command -obj-y += nvedit.o +obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += nvedit.o obj-$(CONFIG_TI_COMMON_CMD_OPTIONS) += ti/ --- 2.24.1

2 2

[PATCH v2 00/11] riscv: Add Sipeed Maix support
by Sean Anderson 02 Feb '20

02 Feb '20

This patch series adds support for Sipeed Maix boards and the Kendryte K210 CPU. Currently, only the Maix Bit V2.0 is supported, however other models are similar. This series depends on <https://patchwork.ozlabs.org/patch/1215327/> (clk: Include missing headers for linux/clk-provider.h). To flash u-boot to a maix bit, run kflash -tp /dev/<your tty here> -B bit_mic u-boot-dtb.bin Boot output should look like the following: U-Boot 2020.01-00455-gad03fd83e1 (Jan 15 2020 - 17:10:24 -0500) DRAM: 8 MiB MMC: spi@52000000:slot@0: 0 In: serial@38000000 Out: serial@38000000 Err: serial@38000000 => I would really appreciate feedback! Many of the changes I had to make for this revision were fairly trivial and could have been caught by someone more familiar with the source code than I. In particular, there are still some questions in individual patches which have yet to be answered. Changes for v2: Many bugfixes for the device tree. Modify the config to build without errors. Add support for keeping internal PLL frequencies in-range. Fix several rebase-induced artifacts. Sean Anderson (11): clk: Always use the supplied struct clk clk: Check that ops of composite clock components exist before calling riscv: Add headers for asm/global_data.h riscv: Add an option to default to RV64I riscv: Add option to disable writes to mcounteren riscv: Fix incorrect cpu frequency on RV64 riscv: Add initial Sipeed Maix support riscv: Add device tree for K210 riscv: Add K210 sysctl support riscv: Add K210 pll support riscv: Add K210 clock support arch/riscv/Kconfig | 19 + arch/riscv/cpu/cpu.c | 2 + arch/riscv/dts/Makefile | 1 + arch/riscv/dts/k210-maix-bit.dts | 42 ++ arch/riscv/dts/k210.dtsi | 453 ++++++++++++++++++ arch/riscv/include/asm/global_data.h | 2 + arch/riscv/include/asm/k210_sysctl.h | 43 ++ arch/riscv/lib/Makefile | 1 + arch/riscv/lib/k210_sysctl.c | 21 + board/sipeed/maix/Kconfig | 49 ++ board/sipeed/maix/MAINTAINERS | 13 + board/sipeed/maix/Makefile | 5 + board/sipeed/maix/maix.c | 9 + configs/sipeed_maix_bitm_defconfig | 95 ++++ drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 1 + drivers/clk/clk-composite.c | 65 ++- drivers/clk/clk-divider.c | 6 +- drivers/clk/clk-fixed-factor.c | 3 +- drivers/clk/clk-gate.c | 6 +- drivers/clk/clk-mux.c | 12 +- drivers/clk/imx/clk-gate2.c | 4 +- drivers/clk/kendryte/Kconfig | 7 + drivers/clk/kendryte/Makefile | 1 + drivers/clk/kendryte/clk.c | 390 ++++++++++++++++ drivers/clk/kendryte/clk.h | 27 ++ drivers/clk/kendryte/pll.c | 598 ++++++++++++++++++++++++ drivers/clk/kendryte/pll.h | 38 ++ drivers/cpu/riscv_cpu.c | 2 + include/configs/sipeed-maix.h | 19 + include/dt-bindings/clock/k210-sysctl.h | 54 +++ include/dt-bindings/reset/k210-sysctl.h | 38 ++ 32 files changed, 1985 insertions(+), 42 deletions(-) create mode 100644 arch/riscv/dts/k210-maix-bit.dts create mode 100644 arch/riscv/dts/k210.dtsi create mode 100644 arch/riscv/include/asm/k210_sysctl.h create mode 100644 arch/riscv/lib/k210_sysctl.c create mode 100644 board/sipeed/maix/Kconfig create mode 100644 board/sipeed/maix/MAINTAINERS create mode 100644 board/sipeed/maix/Makefile create mode 100644 board/sipeed/maix/maix.c create mode 100644 configs/sipeed_maix_bitm_defconfig create mode 100644 drivers/clk/kendryte/Kconfig create mode 100644 drivers/clk/kendryte/Makefile create mode 100644 drivers/clk/kendryte/clk.c create mode 100644 drivers/clk/kendryte/clk.h create mode 100644 drivers/clk/kendryte/pll.c create mode 100644 drivers/clk/kendryte/pll.h create mode 100644 include/configs/sipeed-maix.h create mode 100644 include/dt-bindings/clock/k210-sysctl.h create mode 100644 include/dt-bindings/reset/k210-sysctl.h -- 2.24.1

3 32

[Patchv4 0/3] Odroid n2 using eMMC would fail to boot up
by Anand Moon 02 Feb '20

02 Feb '20

Here are some small changes to fix booting of Odroid N2 using eMMC. Fixed the clk tunnig during mmc initialization. Added two new patches to fix warning Build and tested on top of below patches [0] https://patchwork.ozlabs.org/patch/1213648/ [1] https://patchwork.ozlabs.org/patch/1213650/ Tested on below eMMC module on Odroid N2 and C2 new orange - eMMC AJNB4R 14.6 GiB MMC 5.1 old back - eMMC CGND3R 58.2 GiB MMC 5.0 Prevoius changes: Fixed the clk tuning as per mainline kernel [3]v1 https://patchwork.ozlabs.org/cover/1201206/ [4]v2 https://patchwork.ozlabs.org/cover/1215217/ [5]v3 https://www.mail-archive.com/u-boot@lists.denx.de/msg351859.html -Anand Anand Moon (3): mmc: meson-gx: Fix clk phase tuning for MMC arm: dts: Add mmc alias to avoid warning arm: dts: Add cd-gpio for eMMC arch/arm/dts/meson-axg-s400.dts | 2 + arch/arm/dts/meson-g12a-sei510.dts | 3 ++ arch/arm/dts/meson-g12a-u200.dts | 3 ++ arch/arm/dts/meson-g12b-odroid-n2.dts | 4 ++ arch/arm/dts/meson-gxbb-odroidc2.dts | 3 ++ arch/arm/dts/meson-gxbb-p20x.dtsi | 3 ++ arch/arm/dts/meson-gxl-s805x-libretech-ac.dts | 3 ++ arch/arm/dts/meson-gxl-s905x-p212.dtsi | 3 ++ arch/arm/dts/meson-gxm-khadas-vim2.dts | 3 ++ arch/arm/dts/meson-sm1-sei610.dts | 3 ++ arch/arm/include/asm/arch-meson/sd_emmc.h | 11 ++---- drivers/mmc/meson_gx_mmc.c | 38 ++++++++++++++++--- 12 files changed, 65 insertions(+), 14 deletions(-) -- 2.25.0

3 11

[PATCH 0/3] Support SDMA mode on RPI4 target - 32bit
by Jaehoon Chung 01 Feb '20

01 Feb '20

RPI4's SDHCI controller is supported SDMA mode. (Checked on kernel side) But It doesn't use on u-boot side. Then it's too slow about read/write performance. This patchset is supported SDMA mode on RPI4 target(32bit). - I didn't test on RPI4 64bit. Read/write time about 8MB file Before - Read : 1.472 seconds - Write : 4.690 seconds After - Read : 0.359 seconds - Write : 0.574 seconds This patch is based on my RFC's patches. Jaehoon Chung (3): mmc: sdhci: use phys2bus macro when dma address is accessed mmc: sdhci: not return error when SDMA is not supported configs: rpi_4_32b_defconfig: enable SDHCI_SDMA config configs/rpi_4_32b_defconfig | 1 + drivers/mmc/sdhci.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) -- 2.25.0

4 9

[PATCH 1/1] test: efi_selftest: fix pylint warnings
by Heinrich Schuchardt 01 Feb '20

01 Feb '20

Fix pylint warnings: * add missing module and function documentation * correct indentation Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- test/py/tests/test_efi_selftest.py | 361 +++++++++++++++-------------- 1 file changed, 187 insertions(+), 174 deletions(-) diff --git a/test/py/tests/test_efi_selftest.py b/test/py/tests/test_efi_selftest.py index ca01542088..971c9f6053 100644 --- a/test/py/tests/test_efi_selftest.py +++ b/test/py/tests/test_efi_selftest.py @@ -1,198 +1,211 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2017, Heinrich Schuchardt <xypron.glpk(a)gmx.de> -# Test efi API implementation +""" +Test UEFI API implementation +""" import pytest -import u_boot_utils @pytest.mark.buildconfigspec('cmd_bootefi_selftest') def test_efi_selftest(u_boot_console): - """Test the UEFI implementation + """Run UEFI unit tests - :param u_boot_console: U-Boot console + :param u_boot_console: U-Boot console - This function executes all selftests that are not marked as on request. - """ - u_boot_console.run_command(cmd='setenv efi_selftest') - u_boot_console.run_command(cmd='bootefi selftest', wait_for_prompt=False) - m = u_boot_console.p.expect(['Summary: 0 failures', 'Press any key']) - if m != 0: - raise Exception('Failures occurred during the EFI selftest') - u_boot_console.restart_uboot(); + This function executes all selftests that are not marked as on request. + """ + u_boot_console.run_command(cmd='setenv efi_selftest') + u_boot_console.run_command(cmd='bootefi selftest', wait_for_prompt=False) + m = u_boot_console.p.expect(['Summary: 0 failures', 'Press any key']) + if m != 0: + raise Exception('Failures occurred during the EFI selftest') + u_boot_console.restart_uboot() @pytest.mark.buildconfigspec('cmd_bootefi_selftest') @pytest.mark.buildconfigspec('of_control') @pytest.mark.notbuildconfigspec('generate_acpi_table') def test_efi_selftest_device_tree(u_boot_console): - u_boot_console.run_command(cmd='setenv efi_selftest list') - output = u_boot_console.run_command('bootefi selftest') - assert '\'device tree\'' in output - u_boot_console.run_command(cmd='setenv efi_selftest device tree') - u_boot_console.run_command(cmd='setenv -f serial# Testing DT') - u_boot_console.run_command(cmd='bootefi selftest ${fdtcontroladdr}', wait_for_prompt=False) - m = u_boot_console.p.expect(['serial-number: Testing DT', 'U-Boot']) - if m != 0: - raise Exception('serial-number missing in device tree') - u_boot_console.restart_uboot(); + """Test the device tree support in the UEFI sub-system + + :param u_boot_console: U-Boot console + + This test executes the UEFI unit test by calling 'bootefi selftest'. + """ + u_boot_console.run_command(cmd='setenv efi_selftest list') + output = u_boot_console.run_command('bootefi selftest') + assert '\'device tree\'' in output + u_boot_console.run_command(cmd='setenv efi_selftest device tree') + u_boot_console.run_command(cmd='setenv -f serial# Testing DT') + u_boot_console.run_command(cmd='bootefi selftest ${fdtcontroladdr}', wait_for_prompt=False) + m = u_boot_console.p.expect(['serial-number: Testing DT', 'U-Boot']) + if m != 0: + raise Exception('serial-number missing in device tree') + u_boot_console.restart_uboot() @pytest.mark.buildconfigspec('cmd_bootefi_selftest') def test_efi_selftest_watchdog_reboot(u_boot_console): - u_boot_console.run_command(cmd='setenv efi_selftest list') - output = u_boot_console.run_command('bootefi selftest') - assert '\'watchdog reboot\'' in output - u_boot_console.run_command(cmd='setenv efi_selftest watchdog reboot') - u_boot_console.run_command(cmd='bootefi selftest', wait_for_prompt=False) - m = u_boot_console.p.expect(['resetting', 'U-Boot']) - if m != 0: - raise Exception('Reset failed in \'watchdog reboot\' test') - u_boot_console.restart_uboot(); + """Test the watchdog timer + + :param u_boot_console: U-Boot console + + This function executes the 'watchdog reboot' unit test. + """ + u_boot_console.run_command(cmd='setenv efi_selftest list') + output = u_boot_console.run_command('bootefi selftest') + assert '\'watchdog reboot\'' in output + u_boot_console.run_command(cmd='setenv efi_selftest watchdog reboot') + u_boot_console.run_command(cmd='bootefi selftest', wait_for_prompt=False) + m = u_boot_console.p.expect(['resetting', 'U-Boot']) + if m != 0: + raise Exception('Reset failed in \'watchdog reboot\' test') + u_boot_console.restart_uboot() @pytest.mark.buildconfigspec('cmd_bootefi_selftest') def test_efi_selftest_text_input(u_boot_console): - """Test the EFI_SIMPLE_TEXT_INPUT_PROTOCOL - - :param u_boot_console: U-Boot console - - This function calls the text input EFI selftest. - """ - u_boot_console.run_command(cmd='setenv efi_selftest text input') - output = u_boot_console.run_command(cmd='bootefi selftest', - wait_for_prompt=False) - m = u_boot_console.p.expect([r'To terminate type \'x\'']) - if m != 0: - raise Exception('No prompt for \'text input\' test') - u_boot_console.drain_console() - u_boot_console.p.timeout = 500 - # EOT - u_boot_console.run_command(cmd=chr(4), wait_for_echo=False, - send_nl=False, wait_for_prompt=False) - m = u_boot_console.p.expect( - [r'Unicode char 4 $unknown$, scan code 0 $Null$']) - if m != 0: - raise Exception('EOT failed in \'text input\' test') - u_boot_console.drain_console() - # BS - u_boot_console.run_command(cmd=chr(8), wait_for_echo=False, - send_nl=False, wait_for_prompt=False) - m = u_boot_console.p.expect( - [r'Unicode char 8 $BS$, scan code 0 $Null$']) - if m != 0: - raise Exception('BS failed in \'text input\' test') - u_boot_console.drain_console() - # TAB - u_boot_console.run_command(cmd=chr(9), wait_for_echo=False, - send_nl=False, wait_for_prompt=False) - m = u_boot_console.p.expect( - [r'Unicode char 9 $TAB$, scan code 0 $Null$']) - if m != 0: - raise Exception('BS failed in \'text input\' test') - u_boot_console.drain_console() - # a - u_boot_console.run_command(cmd='a', wait_for_echo=False, send_nl=False, - wait_for_prompt=False) - m = u_boot_console.p.expect( - [r'Unicode char 97 $\'a\'$, scan code 0 $Null$']) - if m != 0: - raise Exception('\'a\' failed in \'text input\' test') - u_boot_console.drain_console() - # UP escape sequence - u_boot_console.run_command(cmd=chr(27) + '[A', wait_for_echo=False, - send_nl=False, wait_for_prompt=False) - m = u_boot_console.p.expect( - [r'Unicode char 0 $Null$, scan code 1 $Up$']) - if m != 0: - raise Exception('UP failed in \'text input\' test') - u_boot_console.drain_console() - # Euro sign - u_boot_console.run_command(cmd=b'\xe2\x82\xac'.decode(), wait_for_echo=False, - send_nl=False, wait_for_prompt=False) - m = u_boot_console.p.expect([r'Unicode char 8364 \(\'']) - if m != 0: - raise Exception('Euro sign failed in \'text input\' test') - u_boot_console.drain_console() - u_boot_console.run_command(cmd='x', wait_for_echo=False, send_nl=False, - wait_for_prompt=False) - m = u_boot_console.p.expect(['Summary: 0 failures', 'Press any key']) - if m != 0: - raise Exception('Failures occurred during the EFI selftest') - u_boot_console.restart_uboot(); + """Test the EFI_SIMPLE_TEXT_INPUT_PROTOCOL + + :param u_boot_console: U-Boot console + + This function calls the text input EFI selftest. + """ + u_boot_console.run_command(cmd='setenv efi_selftest text input') + output = u_boot_console.run_command(cmd='bootefi selftest', + wait_for_prompt=False) + m = u_boot_console.p.expect([r'To terminate type \'x\'']) + if m != 0: + raise Exception('No prompt for \'text input\' test') + u_boot_console.drain_console() + u_boot_console.p.timeout = 500 + # EOT + u_boot_console.run_command(cmd=chr(4), wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect( + [r'Unicode char 4 $unknown$, scan code 0 $Null$']) + if m != 0: + raise Exception('EOT failed in \'text input\' test') + u_boot_console.drain_console() + # BS + u_boot_console.run_command(cmd=chr(8), wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect( + [r'Unicode char 8 $BS$, scan code 0 $Null$']) + if m != 0: + raise Exception('BS failed in \'text input\' test') + u_boot_console.drain_console() + # TAB + u_boot_console.run_command(cmd=chr(9), wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect( + [r'Unicode char 9 $TAB$, scan code 0 $Null$']) + if m != 0: + raise Exception('BS failed in \'text input\' test') + u_boot_console.drain_console() + # a + u_boot_console.run_command(cmd='a', wait_for_echo=False, send_nl=False, + wait_for_prompt=False) + m = u_boot_console.p.expect( + [r'Unicode char 97 $\'a\'$, scan code 0 $Null$']) + if m != 0: + raise Exception('\'a\' failed in \'text input\' test') + u_boot_console.drain_console() + # UP escape sequence + u_boot_console.run_command(cmd=chr(27) + '[A', wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect( + [r'Unicode char 0 $Null$, scan code 1 $Up$']) + if m != 0: + raise Exception('UP failed in \'text input\' test') + u_boot_console.drain_console() + # Euro sign + u_boot_console.run_command(cmd=b'\xe2\x82\xac'.decode(), wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect([r'Unicode char 8364 \(\'']) + if m != 0: + raise Exception('Euro sign failed in \'text input\' test') + u_boot_console.drain_console() + u_boot_console.run_command(cmd='x', wait_for_echo=False, send_nl=False, + wait_for_prompt=False) + m = u_boot_console.p.expect(['Summary: 0 failures', 'Press any key']) + if m != 0: + raise Exception('Failures occurred during the EFI selftest') + u_boot_console.restart_uboot() @pytest.mark.buildconfigspec('cmd_bootefi_selftest') def test_efi_selftest_text_input_ex(u_boot_console): - """Test the EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL - - :param u_boot_console: U-Boot console - - This function calls the extended text input EFI selftest. - """ - u_boot_console.run_command(cmd='setenv efi_selftest extended text input') - output = u_boot_console.run_command(cmd='bootefi selftest', - wait_for_prompt=False) - m = u_boot_console.p.expect([r'To terminate type \'CTRL\+x\'']) - if m != 0: - raise Exception('No prompt for \'text input\' test') - u_boot_console.drain_console() - u_boot_console.p.timeout = 500 - # EOT - u_boot_console.run_command(cmd=chr(4), wait_for_echo=False, - send_nl=False, wait_for_prompt=False) - m = u_boot_console.p.expect( - [r'Unicode char 100 $\'d\'$, scan code 0 $CTRL\+Null$']) - if m != 0: - raise Exception('EOT failed in \'text input\' test') - u_boot_console.drain_console() - # BS - u_boot_console.run_command(cmd=chr(8), wait_for_echo=False, - send_nl=False, wait_for_prompt=False) - m = u_boot_console.p.expect( - [r'Unicode char 8 $BS$, scan code 0 $\+Null$']) - if m != 0: - raise Exception('BS failed in \'text input\' test') - u_boot_console.drain_console() - # TAB - u_boot_console.run_command(cmd=chr(9), wait_for_echo=False, - send_nl=False, wait_for_prompt=False) - m = u_boot_console.p.expect( - [r'Unicode char 9 $TAB$, scan code 0 $\+Null$']) - if m != 0: - raise Exception('TAB failed in \'text input\' test') - u_boot_console.drain_console() - # a - u_boot_console.run_command(cmd='a', wait_for_echo=False, send_nl=False, - wait_for_prompt=False) - m = u_boot_console.p.expect( - [r'Unicode char 97 $\'a\'$, scan code 0 $Null$']) - if m != 0: - raise Exception('\'a\' failed in \'text input\' test') - u_boot_console.drain_console() - # UP escape sequence - u_boot_console.run_command(cmd=chr(27) + '[A', wait_for_echo=False, - send_nl=False, wait_for_prompt=False) - m = u_boot_console.p.expect( - [r'Unicode char 0 $Null$, scan code 1 $\+Up$']) - if m != 0: - raise Exception('UP failed in \'text input\' test') - u_boot_console.drain_console() - # Euro sign - u_boot_console.run_command(cmd=b'\xe2\x82\xac'.decode(), wait_for_echo=False, - send_nl=False, wait_for_prompt=False) - m = u_boot_console.p.expect([r'Unicode char 8364 $\'']) - if m != 0: - raise Exception('Euro sign failed in \'text input\' test') - u_boot_console.drain_console() - # SHIFT+ALT+FN 5 - u_boot_console.run_command(cmd=b'\x1b\x5b\x31\x35\x3b\x34\x7e'.decode(), - wait_for_echo=False, send_nl=False, - wait_for_prompt=False) - m = u_boot_console.p.expect( - [r'Unicode char 0 \(Null$, scan code 15 $SHIFT\+ALT\+FN 5$']) - if m != 0: - raise Exception('SHIFT+ALT+FN 5 failed in \'text input\' test') - u_boot_console.drain_console() - u_boot_console.run_command(cmd=chr(24), wait_for_echo=False, send_nl=False, - wait_for_prompt=False) - m = u_boot_console.p.expect(['Summary: 0 failures', 'Press any key']) - if m != 0: - raise Exception('Failures occurred during the EFI selftest') - u_boot_console.restart_uboot(); + """Test the EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL + + :param u_boot_console: U-Boot console + + This function calls the extended text input EFI selftest. + """ + u_boot_console.run_command(cmd='setenv efi_selftest extended text input') + output = u_boot_console.run_command(cmd='bootefi selftest', + wait_for_prompt=False) + m = u_boot_console.p.expect([r'To terminate type \'CTRL\+x\'']) + if m != 0: + raise Exception('No prompt for \'text input\' test') + u_boot_console.drain_console() + u_boot_console.p.timeout = 500 + # EOT + u_boot_console.run_command(cmd=chr(4), wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect( + [r'Unicode char 100 $\'d\'$, scan code 0 $CTRL\+Null$']) + if m != 0: + raise Exception('EOT failed in \'text input\' test') + u_boot_console.drain_console() + # BS + u_boot_console.run_command(cmd=chr(8), wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect( + [r'Unicode char 8 $BS$, scan code 0 $\+Null$']) + if m != 0: + raise Exception('BS failed in \'text input\' test') + u_boot_console.drain_console() + # TAB + u_boot_console.run_command(cmd=chr(9), wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect( + [r'Unicode char 9 $TAB$, scan code 0 $\+Null$']) + if m != 0: + raise Exception('TAB failed in \'text input\' test') + u_boot_console.drain_console() + # a + u_boot_console.run_command(cmd='a', wait_for_echo=False, send_nl=False, + wait_for_prompt=False) + m = u_boot_console.p.expect( + [r'Unicode char 97 $\'a\'$, scan code 0 $Null$']) + if m != 0: + raise Exception('\'a\' failed in \'text input\' test') + u_boot_console.drain_console() + # UP escape sequence + u_boot_console.run_command(cmd=chr(27) + '[A', wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect( + [r'Unicode char 0 $Null$, scan code 1 $\+Up$']) + if m != 0: + raise Exception('UP failed in \'text input\' test') + u_boot_console.drain_console() + # Euro sign + u_boot_console.run_command(cmd=b'\xe2\x82\xac'.decode(), wait_for_echo=False, + send_nl=False, wait_for_prompt=False) + m = u_boot_console.p.expect([r'Unicode char 8364 $\'']) + if m != 0: + raise Exception('Euro sign failed in \'text input\' test') + u_boot_console.drain_console() + # SHIFT+ALT+FN 5 + u_boot_console.run_command(cmd=b'\x1b\x5b\x31\x35\x3b\x34\x7e'.decode(), + wait_for_echo=False, send_nl=False, + wait_for_prompt=False) + m = u_boot_console.p.expect( + [r'Unicode char 0 \(Null$, scan code 15 $SHIFT\+ALT\+FN 5$']) + if m != 0: + raise Exception('SHIFT+ALT+FN 5 failed in \'text input\' test') + u_boot_console.drain_console() + u_boot_console.run_command(cmd=chr(24), wait_for_echo=False, send_nl=False, + wait_for_prompt=False) + m = u_boot_console.p.expect(['Summary: 0 failures', 'Press any key']) + if m != 0: + raise Exception('Failures occurred during the EFI selftest') + u_boot_console.restart_uboot() -- 2.24.1

1 0

[PATCH 1/1] test: test_efi_fit: fix pylint warnings
by Heinrich Schuchardt 01 Feb '20

01 Feb '20

Fix warnings issued by pylint: * naming of variables * usage of commas and semicolons * indentation * placement of module description Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- test/py/tests/test_efi_fit.py | 77 ++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/test/py/tests/test_efi_fit.py b/test/py/tests/test_efi_fit.py index 6986b2d35c..beaf4a3c51 100644 --- a/test/py/tests/test_efi_fit.py +++ b/test/py/tests/test_efi_fit.py @@ -9,10 +9,6 @@ # # Test launching UEFI binaries from FIT images. -import os.path -import pytest -import u_boot_utils as util - """ Note: This test relies on boardenv_* containing configuration values to define which network environment is available for testing. Without this, the parts @@ -57,8 +53,12 @@ env__efi_fit_tftp_file = { } """ +import os.path +import pytest +import u_boot_utils as util + # Define the parametrized ITS data to be used for FIT images generation. -its_data = ''' +ITS_DATA = ''' /dts-v1/; / { @@ -101,7 +101,7 @@ its_data = ''' ''' # Define the parametrized FDT data to be used for DTB images generation. -fdt_data = ''' +FDT_DATA = ''' /dts-v1/; / { @@ -199,16 +199,16 @@ def test_efi_fit_launch(u_boot_console): cons.run_command('setenv %s %s' % (var, val)) return True - def make_fpath(fname): + def make_fpath(file_name): """Compute the path of a given (temporary) file. Args: - fname: The name of a file within U-Boot build dir. + file_name: The name of a file within U-Boot build dir. Return: The computed file path. """ - return os.path.join(cons.config.build_dir, fname) + return os.path.join(cons.config.build_dir, file_name) def make_efi(fname, comp): """Create an UEFI binary. @@ -225,7 +225,8 @@ def test_efi_fit_launch(u_boot_console): bin_path = make_fpath(fname) util.run_and_log(cons, - ['cp', make_fpath('lib/efi_loader/helloworld.efi'), bin_path]) + ['cp', make_fpath('lib/efi_loader/helloworld.efi'), + bin_path]) if comp: util.run_and_log(cons, ['gzip', '-f', bin_path]) bin_path += '.gz' @@ -251,8 +252,8 @@ def test_efi_fit_launch(u_boot_console): # Generate a test FDT file. dts = make_fpath('test-efi-fit-%s.dts' % fdt_type) - with open(dts, 'w') as fd: - fd.write(fdt_data % fdt_params) + with open(dts, 'w') as file: + file.write(FDT_DATA % fdt_params) # Build the test FDT. dtb = make_fpath('test-efi-fit-%s.dtb' % fdt_type) @@ -284,65 +285,65 @@ def test_efi_fit_launch(u_boot_console): # Generate a test ITS file. its_path = make_fpath('test-efi-fit-helloworld.its') - with open(its_path, 'w') as fd: - fd.write(its_data % its_params) + with open(its_path, 'w') as file: + file.write(ITS_DATA % its_params) # Build the test ITS. fit_path = make_fpath('test-efi-fit-helloworld.fit') util.run_and_log( - cons, [make_fpath('tools/mkimage'), '-f', its_path, fit_path]) + cons, [make_fpath('tools/mkimage'), '-f', its_path, fit_path]) return fit_path - def load_fit_from_host(f): + def load_fit_from_host(fit): """Load the FIT image using the 'host load' command and return its address. Args: - f: Dictionary describing the FIT image to load, see env__efi_fit_test_file - in the comment at the beginning of this file. + fit: Dictionary describing the FIT image to load, see env__efi_fit_test_file + in the comment at the beginning of this file. Return: The address where the file has been loaded. """ - addr = f.get('addr', None) + addr = fit.get('addr', None) if not addr: addr = util.find_ram_base(cons) output = cons.run_command( - 'host load hostfs - %x %s/%s' % (addr, f['dn'], f['fn'])) + 'host load hostfs - %x %s/%s' % (addr, fit['dn'], fit['fn'])) expected_text = ' bytes read' - sz = f.get('size', None) - if sz: - expected_text = '%d' % sz + expected_text - assert(expected_text in output) + size = fit.get('size', None) + if size: + expected_text = '%d' % size + expected_text + assert expected_text in output return addr - def load_fit_from_tftp(f): + def load_fit_from_tftp(fit): """Load the FIT image using the tftpboot command and return its address. The file is downloaded from the TFTP server, its size and optionally its CRC32 are validated. Args: - f: Dictionary describing the FIT image to load, see env__efi_fit_tftp_file - in the comment at the beginning of this file. + fit: Dictionary describing the FIT image to load, see env__efi_fit_tftp_file + in the comment at the beginning of this file. Return: The address where the file has been loaded. """ - addr = f.get('addr', None) + addr = fit.get('addr', None) if not addr: addr = util.find_ram_base(cons) - fn = f['fn'] - output = cons.run_command('tftpboot %x %s' % (addr, fn)) + file_name = fit['fn'] + output = cons.run_command('tftpboot %x %s' % (addr, file_name)) expected_text = 'Bytes transferred = ' - sz = f.get('size', None) - if sz: - expected_text += '%d' % sz + size = fit.get('size', None) + if size: + expected_text += '%d' % size assert expected_text in output - expected_crc = f.get('crc32', None) + expected_crc = fit.get('crc32', None) if not expected_crc: return addr @@ -398,8 +399,8 @@ def test_efi_fit_launch(u_boot_console): if not fit: pytest.skip('No env__efi_fit_tftp_file binary specified in environment') - sz = fit.get('size', None) - if not sz: + size = fit.get('size', None) + if not size: if not fit.get('dn', None): pytest.skip('Neither "size", nor "dn" info provided in env__efi_fit_tftp_file') @@ -420,12 +421,12 @@ def test_efi_fit_launch(u_boot_console): # Try booting. cons.run_command( - 'bootm %x#%s' % (addr, fit_config), wait_for_prompt=False) + 'bootm %x#%s' % (addr, fit_config), wait_for_prompt=False) if enable_fdt: cons.wait_for('Booting using the fdt blob') cons.wait_for('Hello, world') cons.wait_for('## Application terminated, r = 0') - cons.restart_uboot(); + cons.restart_uboot() cons = u_boot_console # Array slice removes leading/trailing quotes. -- 2.24.1

1 0

[PATCH v2 1/2] spl: Kconfig: Replace CONFIG_SPL_NET_SUPPORT with CONFIG_SPL_NET
by Nathan Rossi 01 Feb '20

01 Feb '20

Replace CONFIG_SPL_NET_SUPPORT with CONFIG_SPL_NET to match CONFIG_NET so that CONFIG_$(SPL_)NET can be used to conditionally select build objects between SPL and U-Boot. Signed-off-by: Nathan Rossi <nathan(a)nathanrossi.com> --- Changes in v2: - Missed entry in common/spl/Makefile that already has conditional prefix --- common/Makefile | 2 +- common/spl/Kconfig | 10 +++++----- common/spl/Makefile | 2 +- configs/am335x_boneblack_vboot_defconfig | 2 +- configs/am335x_evm_defconfig | 2 +- configs/am335x_guardian_defconfig | 2 +- configs/am43xx_evm_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- configs/chromebook_link64_defconfig | 2 +- configs/chromebook_samus_tpl_defconfig | 2 +- configs/pcm051_rev1_defconfig | 2 +- configs/pcm051_rev3_defconfig | 2 +- configs/pengwyn_defconfig | 2 +- configs/qemu-x86_64_defconfig | 2 +- doc/SPL/README.am335x-network | 2 +- lib/tiny-printf.c | 4 ++-- scripts/Makefile.spl | 2 +- tools/buildman/README | 8 ++++---- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/common/Makefile b/common/Makefile index 5f62b8d0b1..9bb00dd66e 100644 --- a/common/Makefile +++ b/common/Makefile @@ -71,7 +71,7 @@ obj-$(CONFIG_SPL_HASH_SUPPORT) += hash.o obj-$(CONFIG_TPL_HASH_SUPPORT) += hash.o obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o -obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o +obj-$(CONFIG_SPL_NET) += miiphyutil.o obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o ifdef CONFIG_SPL_USB_HOST_SUPPORT diff --git a/common/spl/Kconfig b/common/spl/Kconfig index b03a476b9f..abfc719c91 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -556,7 +556,7 @@ config SPL_ETH_SUPPORT drivers in SPL. This permits SPL to load U-Boot over an Ethernet link rather than from an on-board peripheral. Environment support is required since the network stack uses a number of environment - variables. See also SPL_NET_SUPPORT. + variables. See also SPL_NET. config SPL_FS_EXT4 bool "Support EXT filesystems" @@ -847,7 +847,7 @@ config UBI_SPL_SILENCE_MSG endif # if SPL_UBI -config SPL_NET_SUPPORT +config SPL_NET bool "Support networking" help Enable support for network devices (such as Ethernet) in SPL. @@ -856,7 +856,7 @@ config SPL_NET_SUPPORT the network stack uses a number of environment variables. See also SPL_ETH_SUPPORT. -if SPL_NET_SUPPORT +if SPL_NET config SPL_NET_VCI_STRING string "BOOTP Vendor Class Identifier string sent by SPL" help @@ -865,7 +865,7 @@ config SPL_NET_VCI_STRING of a client. This is often used in practice to allow for the DHCP server to specify different files to load depending on if the ROM, SPL or U-Boot itself makes the request -endif # if SPL_NET_SUPPORT +endif # if SPL_NET config SPL_NO_CPU_SUPPORT bool "Drop CPU code in SPL" @@ -1152,7 +1152,7 @@ config SPL_USB_ETHER USB-connected Ethernet link (such as a USB Ethernet dongle) rather than from an onboard peripheral. Environment support is required since the network stack uses a number of environment variables. - See also SPL_NET_SUPPORT and SPL_ETH_SUPPORT. + See also SPL_NET and SPL_ETH_SUPPORT. config SPL_DFU bool "Support DFU (Device Firmware Upgrade)" diff --git a/common/spl/Makefile b/common/spl/Makefile index eaa57f5ce5..ed5ba9e057 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) += spl_nand.o obj-$(CONFIG_$(SPL_TPL_)ONENAND_SUPPORT) += spl_onenand.o endif obj-$(CONFIG_$(SPL_TPL_)UBI) += spl_ubi.o -obj-$(CONFIG_$(SPL_TPL_)NET_SUPPORT) += spl_net.o +obj-$(CONFIG_$(SPL_TPL_)NET) += spl_net.o obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += spl_mmc.o obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 9cea85413b..11f6656938 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -16,7 +16,7 @@ CONFIG_VERSION_VARIABLE=y CONFIG_ARCH_MISC_INIT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="AM33xx U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_GADGET=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 335aa8cfa1..4a2bd2e3ce 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -17,7 +17,7 @@ CONFIG_SPL_ETH_SUPPORT=y # CONFIG_SPL_FS_EXT4 is not set CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_GADGET=y diff --git a/configs/am335x_guardian_defconfig b/configs/am335x_guardian_defconfig index 13974f7c0f..0f84ccc955 100644 --- a/configs/am335x_guardian_defconfig +++ b/configs/am335x_guardian_defconfig @@ -24,7 +24,7 @@ CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MUSB_NEW_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="Guardian U-Boot SPL" CONFIG_SPL_POWER_SUPPORT=y CONFIG_SPL_USB_GADGET=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 2e64879beb..55a19738c0 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -16,7 +16,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_MISC_INIT_R is not set CONFIG_VERSION_VARIABLE=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_HOST_SUPPORT=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 523ce00585..402771eed2 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -26,7 +26,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET=y diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig index 5abd690b00..1b1b557922 100644 --- a/configs/chromebook_link64_defconfig +++ b/configs/chromebook_link64_defconfig @@ -30,7 +30,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_CPU_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_PCI=y CONFIG_SPL_PCH_SUPPORT=y CONFIG_SPL_RTC_SUPPORT=y diff --git a/configs/chromebook_samus_tpl_defconfig b/configs/chromebook_samus_tpl_defconfig index cd1cc5ffa1..caa25c7ad5 100644 --- a/configs/chromebook_samus_tpl_defconfig +++ b/configs/chromebook_samus_tpl_defconfig @@ -31,7 +31,7 @@ CONFIG_BLOBLIST_SIZE=0x1000 CONFIG_BLOBLIST_ADDR=0xff7c0000 CONFIG_HANDOFF=y CONFIG_SPL_SEPARATE_BSS=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_PCI=y CONFIG_SPL_PCH_SUPPORT=y CONFIG_TPL_PCI=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index cbe6594837..d0262e639a 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -22,7 +22,7 @@ CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_FS_EXT4=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="pcm051 U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_POWER_SUPPORT=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index 744c5827d1..b3e0b9a6a8 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -22,7 +22,7 @@ CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_FS_EXT4=y CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="pcm051 U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_POWER_SUPPORT=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index eadab3e860..e8e0bbf244 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -22,7 +22,7 @@ CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_FS_EXT4=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_POWER_SUPPORT=y diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index a37ec4d0d6..f71cc93118 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -30,7 +30,7 @@ CONFIG_LAST_STAGE_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_CPU_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y -CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET=y CONFIG_SPL_PCI=y CONFIG_SPL_PCH_SUPPORT=y CONFIG_SPL_RTC_SUPPORT=y diff --git a/doc/SPL/README.am335x-network b/doc/SPL/README.am335x-network index e3cf93f8dc..05d1579a64 100644 --- a/doc/SPL/README.am335x-network +++ b/doc/SPL/README.am335x-network @@ -7,7 +7,7 @@ NAND and bricked (empty) board with only a network cable. I. Building the required images 1. You have to enable generic SPL configuration options (see -doc/README.SPL) as well as CONFIG_SPL_NET_SUPPORT, +doc/README.SPL) as well as CONFIG_SPL_NET, CONFIG_ETH_SUPPORT, CONFIG_SPL_LIBGENERIC_SUPPORT and CONFIG_SPL_LIBCOMMON_SUPPORT in your board configuration file to build SPL with support for booting over the network. Also you have to enable diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c index 1138c7012a..db0f23fd1f 100644 --- a/lib/tiny-printf.c +++ b/lib/tiny-printf.c @@ -47,7 +47,7 @@ static void div_out(struct printf_info *info, unsigned long *num, out_dgt(info, dgt); } -#ifdef CONFIG_SPL_NET_SUPPORT +#ifdef CONFIG_SPL_NET static void string(struct printf_info *info, char *s) { char ch; @@ -177,7 +177,7 @@ static void __maybe_unused pointer(struct printf_info *info, const char *fmt, } break; #endif -#ifdef CONFIG_SPL_NET_SUPPORT +#ifdef CONFIG_SPL_NET case 'm': return mac_address_string(info, ptr, false); case 'M': diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 314b02ba07..768eaaf8f5 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -96,7 +96,7 @@ libs-$(CONFIG_SPL_USB_GADGET) += drivers/usb/cdns3/ libs-y += dts/ libs-y += fs/ libs-$(CONFIG_SPL_POST_MEM_SUPPORT) += post/drivers/ -libs-$(CONFIG_SPL_NET_SUPPORT) += net/ +libs-$(CONFIG_SPL_NET) += net/ head-y := $(addprefix $(obj)/,$(head-y)) libs-y := $(addprefix $(obj)/,$(libs-y)) diff --git a/tools/buildman/README b/tools/buildman/README index c1ac0d0f58..3764344fa7 100644 --- a/tools/buildman/README +++ b/tools/buildman/README @@ -983,13 +983,13 @@ For example: ... 43: Convert CONFIG_SPL_USBETH_SUPPORT to Kconfig arm: - + u-boot.cfg: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1 + + u-boot.cfg: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_NET=1 + u-boot-spl.cfg: CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 - + all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1 + + all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET=1 am335x_evm_usbspl : - + u-boot.cfg: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1 + + u-boot.cfg: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_NET=1 + u-boot-spl.cfg: CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 - + all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET_SUPPORT=1 + + all: CONFIG_SPL_ENV_SUPPORT=1 CONFIG_SPL_MMC_SUPPORT=1 CONFIG_SPL_NAND_SUPPORT=1 CONFIG_SPL_NET=1 44: Convert CONFIG_SPL_USB_HOST_SUPPORT to Kconfig ... --- 2.24.1

2 2

[PATCH] cmd: Handle CONFIG_(SPL_)ENV_SUPPORT for toggling the nvedit object
by Nathan Rossi 01 Feb '20

01 Feb '20

When CONFIG_SPL_ENV_SUPPORT is disabled, nvedit was still being included as part of the build. Use the CONFIG_SPL_ENV_SUPPORT value as well as the non SPL CONFIG_ENV_SUPPORT variable to enable/disable the inclusion of nvedit. Signed-off-by: Nathan Rossi <nathan(a)nathanrossi.com> --- cmd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/Makefile b/cmd/Makefile index 4f29b72c69..90dc09d095 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -186,7 +186,7 @@ endif # !CONFIG_SPL_BUILD obj-$(CONFIG_$(SPL_)CMD_TLV_EEPROM) += tlv_eeprom.o # core command -obj-y += nvedit.o +obj-$(CONFIG_$(SPL_)ENV_SUPPORT) += nvedit.o obj-$(CONFIG_TI_COMMON_CMD_OPTIONS) += ti/ --- 2.24.1

2 1

[GIT PULL] UniPhier SoC updates for v2020.04 (2nd)
by Masahiro Yamada 01 Feb '20

01 Feb '20

Hi Tom, Please pull more updates. This includes various Denali NAND driver improvements, and a little bit UniPhier platform changes. Thanks. The following changes since commit b00c3c995bf2293e32cd2be3cb4be7eb39c4ac26: Prepare v2020.04-rc1 (2020-01-28 16:59:30 -0500) are available in the Git repository at: git@gitlab.denx.de:u-boot/custodians/u-boot-uniphier.git tags/uniphier-v2020.04-2 for you to fetch changes up to 76cd7d47fb8ac191553b741bb424e93c94ca759a: ARM: uniphier: use $loadaddr for source command (2020-02-01 01:14:32 +0900) ---------------------------------------------------------------- UniPhier SoC updates for v2020.04 (2nd) Denali NAND driver changes: - Set up more registers in denali-spl for SOCFPGA - Make clocks optional - Do not assert reset signals in the remove hook - associate SPARE_AREA_SKIP_BYTES with DT compatible - switch to UCLASS_MTD UniPhier platform changes: - fix a bug in dram_init() - specify loadaddr for "source" command ---------------------------------------------------------------- Marek Vasut (2): mtd: rawnand: denali-spl: Add missing hardware init on SoCFPGA mtd: rawnand: denali: Do not reset the block before booting the kernel Masahiro Yamada (7): mtd: rawnand: denali_dt: make the core clock optional mtd: rawnand: denali_dt: insert udelay() after reset deassert mtd: rawnand: denali: set SPARE_AREA_SKIP_BYTES based on DT compatible ARM: uniphier: remove adhoc reset deassertion for the NAND controller mtd: rawnand: denali_dt: use UCLASS_MTD instead of UCLASS_MISC ARM: uniphier: set gd->ram_base correctly ARM: uniphier: use $loadaddr for source command arch/arm/Kconfig | 1 + arch/arm/mach-uniphier/board_init.c | 2 -- arch/arm/mach-uniphier/clk/Makefile | 4 +-- arch/arm/mach-uniphier/clk/clk-ld4.c | 32 ------------------ arch/arm/mach-uniphier/clk/clk-pro4.c | 14 ++------ arch/arm/mach-uniphier/clk/clk-pro5.c | 14 ++------ arch/arm/mach-uniphier/clk/clk-pxs2.c | 14 ++------ arch/arm/mach-uniphier/dram_init.c | 7 +--- arch/arm/mach-uniphier/init.h | 1 - drivers/mtd/nand/raw/Kconfig | 2 +- drivers/mtd/nand/raw/denali.c | 15 ++++++--- drivers/mtd/nand/raw/denali.h | 2 -- drivers/mtd/nand/raw/denali_dt.c | 57 +++++++++++++++++++-------------- drivers/mtd/nand/raw/denali_spl.c | 7 ++++ include/configs/uniphier.h | 6 ++-- 15 files changed, 65 insertions(+), 113 deletions(-) delete mode 100644 arch/arm/mach-uniphier/clk/clk-ld4.c -- Best Regards Masahiro Yamada

2 1