November 2019 - U-Boot

[U-Boot] [PATCH 1/1] cbfs: do not pack struct cbfs_cachenode
by Heinrich Schuchardt 02 Nov '19

02 Nov '19

With the __packed attribute sandbox_defconfig cannot be compiled with GCC 9.2.1: fs/cbfs/cbfs.c: In function ‘file_cbfs_fill_cache’: fs/cbfs/cbfs.c:164:16: error: taking address of packed member of ‘struct cbfs_cachenode’ may result in an unaligned pointer value [-Werror=address-of-packed-member] 164 | cache_tail = &new_node->next; | ^~~~~~~~~~~~~~~ struct cbfs_cachenode is only an internal structure. So let's rearrange the fields such that the structure is naturally packed and remove the __packed attribute. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/cbfs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/cbfs.h b/include/cbfs.h index 6d4c4d4b06..f3bc8ca24a 100644 --- a/include/cbfs.h +++ b/include/cbfs.h @@ -72,13 +72,13 @@ struct cbfs_fileheader { struct cbfs_cachenode { struct cbfs_cachenode *next; - u32 type; void *data; - u32 data_length; char *name; + u32 type; + u32 data_length; u32 name_length; u32 attributes_offset; -} __packed; +}; extern enum cbfs_result file_cbfs_result; -- 2.23.0

3 3

[U-Boot] Please pull u-boot-video
by Anatolij Gustschin 02 Nov '19

02 Nov '19

Hi Tom, please pull this build issue fix. gitlab CI and Travis builds were okay. Travis-CI: https://travis-ci.org/vdsao/u-boot-video/builds/605380757 Thanks, Anatolij The following changes since commit 412326d1bc2d346d7b4faad6fa547eaf065681a2: Merge tag 'u-boot-clk-23Oct2019' of https://gitlab.denx.de/u-boot/custodians/u-boot-clk (2019-10-30 13:13:46 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-video.git tags/video-for-2020.01-rc1 for you to fetch changes up to 2ad8494c0fd7279aa9a7f73aff3fc38895e77711: splash: fix build breakage with newer llvm-7 (2019-10-31 09:10:34 +0100) ---------------------------------------------------------------- - fix splash build breakage with newer llvm-7 ---------------------------------------------------------------- Anatolij Gustschin (1): splash: fix build breakage with newer llvm-7 common/splash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 2

[U-Boot] [PATCH] azure: Update the script to prepend PATH not override PATH
by Tom Rini 01 Nov '19

01 Nov '19

Similar to 90d3d78a1c68 ("gitlab-ci: Prepend to PATH rather than replace it") we need to prepend the PATH with our additional binaries and not replace the value fully as doing so breaks virtualenv. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 11d5a6175b0f..862cced1cc56 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -265,7 +265,7 @@ jobs: . /tmp/venv/bin/activate pip install -r test/py/requirements.txt export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/${TEST_PY_BD}; - export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:/usr/bin:/bin; + export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:${PATH}; export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci; if [[ "${TEST_PY_BD}" != "" ]]; then ./test/py/test.py --bd ${TEST_PY_BD} ${TEST_PY_ID} -k "${TEST_PY_TEST_SPEC:-not a_test_which_does_not_exist}" --build-dir "$UBOOT_TRAVIS_BUILD_DIR"; -- 2.17.1

1 1

[U-Boot] Pull request for UEFI sub-system for efi-2020-01-rc2
by Heinrich Schuchardt 01 Nov '19

01 Nov '19

The following changes since commit ffc379b42c85466e1dd4c8fee8268801f26d2ab8: Merge tag 'mips-pull-2019-10-25' of git://git.denx.de/u-boot-mips (2019-10-25 20:07:24 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2020-01-rc2 for you to fetch changes up to e731af4893f7741c66254161ad9b6f5280369895: efi_loader: correct includes in efi_variable.c (2019-10-30 17:49:41 +0100) The size increase in cmd/nvedit_efi.c should not worry you too much as this is not built by default except on QEMU. Gitlab and Travis showed no problems: https://gitlab.denx.de/u-boot/custodians/u-boot-efi/pipelines/1159 https://travis-ci.org/xypron2/u-boot/builds/605091156 Primary key fingerprint: 6DC4 F9C7 1F29 A6FA 06B7 6D33 C481 DBBC 2C05 1AC4 ---------------------------------------------------------------- Pull request for UEFI sub-system for efi-2020-01-rc2 Provide a better user interface for setting UEFI variables. Bug fixes: - ext4 file system not discovered on UEFI block device - 'make tests' build error on 32bit systems ---------------------------------------------------------------- AKASHI Takahiro (1): cmd: env: extend "env [set|print] -e" to manage UEFI variables Heinrich Schuchardt (2): blk: set log2blksz in blk_create_device() efi_loader: correct includes in efi_variable.c cmd/nvedit.c | 19 ++- cmd/nvedit_efi.c | 277 ++++++++++++++++++++++++++++++++++++------ drivers/block/blk-uclass.c | 1 + lib/efi_loader/efi_variable.c | 8 +- 4 files changed, 256 insertions(+), 49 deletions(-)

2 1

[U-Boot] Please pull u-boot-dm
by Simon Glass 01 Nov '19

01 Nov '19

Hi Tom, Test results here: https://gitlab.denx.de/u-boot/custodians/u-boot-dm/pipelines/1131 The following changes since commit ffc379b42c85466e1dd4c8fee8268801f26d2ab8: Merge tag 'mips-pull-2019-10-25' of git://git.denx.de/u-boot-mips (2019-10-25 20:07:24 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-29oct19 for you to fetch changes up to d60ae4c59df55c08dc96202ff58fed21ab3afb7d: fdt: Fix alignment issue when reading 64-bits properties from fdt (2019-10-27 13:01:53 -0600) ---------------------------------------------------------------- Fix for patman with email addresses containing commas Bootstage improvements for TPL, SPL Various sandbox and dm improvements and fixes ---------------------------------------------------------------- Dmitry Torokhov (1): patman: separate emails in CC list with NULs Jean-Jacques Hiblot (2): test: regmap: check the values read from the regmap fdt: Fix alignment issue when reading 64-bits properties from fdt Kever Yang (1): dm: core: Update log method for uclass_find_device_by_seq Simon Glass (14): sandbox: test: Show hex values on failure sandbox: Drop 'const' from sandbox_write() sandbox: test: Add a prototype for sandbox_set_enable_memio() dm: regmap: Fix mask in regmap_update_bits() tiny-printf: Reduce size by removing ctype tiny-printf: Add print_grouped_ull() tiny-printf: Reorder code to support %p bloblist: Reserve an aligned base bootstage: Store the next ID in the stash bootstage: Fix counting of entries in stash bootstage: Avoid conflicts between stash/unstash bootstage: Correct relocation algorithm bootstage: Mark the start/end of TPL and SPL separately bootstage: Allow SPL to obtain bootstage info from TPL arch/sandbox/cpu/cpu.c | 3 +-- arch/sandbox/include/asm/io.h | 11 +++++----- arch/sandbox/include/asm/test.h | 11 ++++++++++ common/board_f.c | 2 ++ common/board_r.c | 1 - common/bootstage.c | 53 ++++++++++++++++++++++++++++++---------------- common/fdt_support.c | 2 +- common/spl/spl.c | 23 ++++++++++++++++---- drivers/core/ofnode.c | 2 +- drivers/core/regmap.c | 2 +- drivers/core/uclass.c | 11 ++++++---- include/bootstage.h | 2 ++ include/linux/libfdt_env.h | 1 + include/regmap.h | 3 ++- include/test/ut.h | 3 ++- lib/fdtdec.c | 2 +- lib/tiny-printf.c | 29 +++++++++++++++++++------ test/dm/regmap.c | 19 ++++++++++++++--- tools/patman/func_test.py | 4 ++-- tools/patman/patman.py | 2 +- tools/patman/series.py | 4 ++-- 21 files changed, 135 insertions(+), 55 deletions(-) Regards, Simon

2 1

[U-Boot] [PATCH] azure: Update for python3 and current pytest
by Tom Rini 01 Nov '19

01 Nov '19

Similar to the rework for GitLab-CI and Travis-CI, rework the Azure Pipeline to use python3 and requirements.txt to install the necessary modules. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .azure-pipelines.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index d476d8d0e94d..11d5a6175b0f 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -1,7 +1,7 @@ variables: windows_vm: vs2015-win2012r2 ubuntu_vm: ubuntu-18.04 - ci_runner_image: trini/u-boot-gitlab-ci-runner:bionic-20190912.1-03Oct2019 + ci_runner_image: trini/u-boot-gitlab-ci-runner:bionic-20191010-20Oct2019 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", # since our $(ci_runner_image) user is not root. @@ -245,11 +245,6 @@ jobs: git clone --depth=1 git://github.com/swarren/uboot-test-hooks.git /tmp/uboot-test-hooks ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname` ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname` - virtualenv /tmp/venv - . /tmp/venv/bin/activate - pip install pytest==2.8.7 - pip install python-subunit - pip install coverage grub-mkimage --prefix=\"\" -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd grub-mkimage --prefix=\"\" -o ~/grub_x64.efi -O x86_64-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd mkdir ~/grub2-arm @@ -266,6 +261,9 @@ jobs: exit $ret; fi; fi + virtualenv -p /usr/bin/python3 /tmp/venv + . /tmp/venv/bin/activate + pip install -r test/py/requirements.txt export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/${TEST_PY_BD}; export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:/usr/bin:/bin; export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci; -- 2.17.1

1 2

[U-Boot] [PATCH v3 0/5] Add helper function for linking a DM Eth device to a PHY
by Alex Marginean 01 Nov '19

01 Nov '19

The patch set introduces dm_eth_phy_connect which takes in an ethernet device and uses DT information to find the associated PHY and connect the Ethernet interface to it. This should simplify similar code in ethernet drivers. A new binding is introduced for scanning an MDIO bus, useful if the bus is private to the Ethernet interface. Finally the patch set updates fsl_enetc driver to use the new helper function. This patch set supersedes v2 series: https://patchwork.ozlabs.org/project/uboot/list/?series=124537 Patch 6 of this series removes code modified in the following patch, a similar change is now part of MDIO helper functions: https://patchwork.ozlabs.org/patch/1184523/ Changes in v3: - added cover letter - check for null PHY pointer before using it in dm_eth_connect_phy_handle - moved the code dealing with MDIO scanning into a separate patch - renames several arguments and variables for a bit more clarity and consistency Changes in v2: - Moved MDIO scan code into dm_mdio_phy_scan which is also exported - Use interface instead of if_type for consistency - don't use phy pointer if NULL in fsl_enetc code Alex Marginean (5): net: mdio-uclass: rename arguments of dm_mdio_phy_connect for consistency net: mdio-uclass: add dm_eth_phy_connect helper function net: mdio-uclass: Add helper functions for scanning the MDIO bus doc: bindings: add mdio-handle property to ethernet nodes drivers: net: fsl_enetc: use the new MDIO DM helper functions doc/device-tree-bindings/net/ethernet.txt | 2 + drivers/net/fsl_enetc.c | 52 ++------ drivers/net/fsl_enetc.h | 1 + include/miiphy.h | 32 ++++- net/mdio-uclass.c | 139 +++++++++++++++++++++- 5 files changed, 175 insertions(+), 51 deletions(-) -- 2.17.1

1 5

[U-Boot] [PATCH 00/10] Moving test/py to Python 3
by Tom Rini 01 Nov '19

01 Nov '19

Hey all, So, here's the first pass at moving our test/py code over to Python 3. It's not quite ready to merge as noted by the WORKAROUND / HACK patches at the end. The first two patches can go in any time and I will probably pull them soon as well. The next patch is an old one from Marek that I deferred at the time, but it's time now so I've updated it slightly to cover the new cases of the same code he fixed before. For migrating the pytest code itself, I've left the conversion split in a few commits. This isn't bisectable but certainly for review it's better. I'm honestly not sure if it's more important for history to keep this bisectable or to have the changes broken out like this. Finally, we have a workaround so that we can do this conversion before we convert buildman/patman/buildman to python3 (as that will take more work, it seems that we've followed an anti-pattern and python3 makes that much more of a pain to live with), a work-around to skip the FS tests just like we are today and then finally disabling EFI tests. I've already told Heinrich on IRC that this will take some work to fix so it's on his list. Now that I've posted this, aside from any feedback I'm going to look at the fs tests and see what's going on there as I'm not sure if we have regressions in the fs code or lack of host tools being installed or possibly both. -- Tom

4 96

[U-Boot] [PATCH] gpio: da8xx_gpio: Fix the _gpio_direction_output function
by Keerthy 01 Nov '19

01 Nov '19

_gpio_direction_output function currently calls gpio_set_value with the wrong gpio number. gpio_set_value in the uclass driver expects a different gpio number and the _gpio_direction_output is currently providing the number specific to the bank. Hence fix it by calling the _gpio_set_value function instead. Reported-by: Faiz Abbas <faiz_abbas(a)ti.com> Fixes: 8e51c0f254 ("dm: gpio: Add DM compatibility to GPIO driver for Davinci") Signed-off-by: Keerthy <j-keerthy(a)ti.com> --- drivers/gpio/da8xx_gpio.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c index 0deb034504..86203307db 100644 --- a/drivers/gpio/da8xx_gpio.c +++ b/drivers/gpio/da8xx_gpio.c @@ -342,13 +342,6 @@ int gpio_free(unsigned int gpio) } #endif -static int _gpio_direction_output(struct davinci_gpio *bank, unsigned int gpio, int value) -{ - clrbits_le32(&bank->dir, 1U << GPIO_BIT(gpio)); - gpio_set_value(gpio, value); - return 0; -} - static int _gpio_direction_input(struct davinci_gpio *bank, unsigned int gpio) { setbits_le32(&bank->dir, 1U << GPIO_BIT(gpio)); @@ -377,6 +370,13 @@ static int _gpio_get_dir(struct davinci_gpio *bank, unsigned int gpio) return in_le32(&bank->dir) & (1U << GPIO_BIT(gpio)); } +static int _gpio_direction_output(struct davinci_gpio *bank, unsigned int gpio, + int value) +{ + clrbits_le32(&bank->dir, 1U << GPIO_BIT(gpio)); + _gpio_set_value(bank, gpio, value); + return 0; +} #ifndef CONFIG_DM_GPIO void gpio_info(void) -- 2.17.1

2 1

[U-Boot] [PATCH] Makefile: Fix printing problem in size_check on overflow
by Tom Rini 01 Nov '19

01 Nov '19

When we have an excess size growth, fix the "limit" printf call to pass in just the limit variable rather than the string bytes to the format character. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cbacf1cfe2c9..f09023a3977f 100644 --- a/Makefile +++ b/Makefile @@ -346,7 +346,7 @@ define size_check limit=$$( printf "%d" $2 ); \ if test $$actual -gt $$limit; then \ echo "$1 exceeds file size limit:" >&2; \ - echo " limit: $$(printf %#x bytes $$limit) bytes" >&2; \ + echo " limit: $$(printf %#x $$limit) bytes" >&2; \ echo " actual: $$(printf %#x $$actual) bytes" >&2; \ echo " excess: $$(printf %#x $$((actual - limit))) bytes" >&2;\ exit 1; \ -- 2.17.1

2 2