May 2018 - U-Boot

[U-Boot] [PATCH v3 1/2] cmd: nvedit: env import can now import only variables passed as parameters
by Quentin Schulz 26 May '18

26 May '18

While the `env export` can take as parameters variables to be exported, `env import` does not have such a mechanism of variable selection. Let's add the ability to add parameters at the end of the command for variables to be imported. Every env variable from the env to be imported passed by parameter to this command will override the value of the variable in the current env. If a variable exists in the current env but not in the imported env, if this variable is passed as a parameter to env import, the variable will be unset. If a variable exists in the imported env, the variable in the current env will be set to the value of the one from the imported env. All the remaining variables are left untouched. As the size parameter of env import is positional but optional, let's add the possibility to use the sentinel '-' for when we don't want to give the size parameter (when the env is '\0' terminated) but we pass a list of variables at the end of the command. env import addr env import addr - env import addr size env import addr - foo1 foo2 env import addr size foo1 foo2 are all valid. env import -c addr env import -c addr - env import -c addr - foo1 foo2 are all invalid because they don't pass the size parameter required for checking, while the following are valid. env import addr size env import addr size foo1 foo2 Nothing's changed for the other parameters or the overall behaviour. One of its use case could be to load a secure environment from the signed U-Boot binary and load only a handful of variables from an other, unsecure, environment without completely losing control of U-Boot. Signed-off-by: Quentin Schulz <quentin.schulz(a)bootlin.com> --- v3: - migrate to env import addr size var... instead of env import -w addr size so that the list of variables to load is more explicit and the behaviour of env import is closer to the one of env export, v2: - use strdup instead of malloc + strcpy, - NULL-check the result of strdup, - add common exit path for freeing memory in one unique place, - store token pointer from strtok within the char** array instead of strdup-ing token within elements of array, cmd/nvedit.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 11489b0..18cc4db 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -1001,7 +1001,7 @@ sep_err: #ifdef CONFIG_CMD_IMPORTENV /* - * env import [-d] [-t [-r] | -b | -c] addr [size] + * env import [-d] [-t [-r] | -b | -c] addr [size] [var ...] * -d: delete existing environment before importing; * otherwise overwrite / append to existing definitions * -t: assume text format; either "size" must be given or the @@ -1015,6 +1015,11 @@ sep_err: * addr: memory address to read from * size: length of input data; if missing, proper '\0' * termination is mandatory + * if var is set and size should be missing (i.e. '\0' + * termination), set size to '-' + * var... List of the names of the only variables that get imported from + * the environment at address 'addr'. Without arguments, the whole + * environment gets imported. */ static int do_env_import(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -1026,6 +1031,7 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag, int fmt = 0; int del = 0; int crlf_is_lf = 0; + int wl = 0; size_t size; cmd = *argv; @@ -1074,9 +1080,9 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag, addr = simple_strtoul(argv[0], NULL, 16); ptr = map_sysmem(addr, 0); - if (argc == 2) { + if (argc >= 2 && strcmp(argv[1], "-")) { size = simple_strtoul(argv[1], NULL, 16); - } else if (argc == 1 && chk) { + } else if (chk) { puts("## Error: external checksum format must pass size\n"); return CMD_RET_FAILURE; } else { @@ -1098,6 +1104,9 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag, printf("## Info: input data size = %zu = 0x%zX\n", size, size); } + if (argc > 2) + wl = 1; + if (chk) { uint32_t crc; env_t *ep = (env_t *)ptr; @@ -1112,9 +1121,10 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag, ptr = (char *)ep->data; } - if (himport_r(&env_htab, ptr, size, sep, del ? 0 : H_NOCLEAR, - crlf_is_lf, 0, NULL) == 0) { + if (!himport_r(&env_htab, ptr, size, sep, del ? 0 : H_NOCLEAR, + crlf_is_lf, wl ? argc - 2 : 0, wl ? &argv[2] : NULL)) { pr_err("Environment import failed: errno = %d\n", errno); + return 1; } gd->flags |= GD_FLG_ENV_READY; @@ -1242,7 +1252,7 @@ static char env_help_text[] = #endif #endif #if defined(CONFIG_CMD_IMPORTENV) - "env import [-d] [-t [-r] | -b | -c] addr [size] - import environment\n" + "env import [-d] [-t [-r] | -b | -c] addr [size] [var ...] - import environment\n" #endif "env print [-a | name ...] - print environment\n" #if defined(CONFIG_CMD_RUN) base-commit: 8a9dc16e4d07d29fff08b7caca36f0865065f7f7 -- git-series 0.9.1

4 6

[U-Boot] [PATCH 0/5] Iotrace improvements
by Ramon Fried 26 May '18

26 May '18

These set of patches add few improvements to iotrace. * Region limiting - allows setting an address and size where only io operations that falls into that address are logged. * Timestamping - Timestamp every iotrace record with current timestamp * dumping - iotrace dump command for dumping all records from buffer in a readable fashion. In terms of backwards compatibility, the timestamp is not backward compatible as it changes the iotrace record. so if one developed an offline parsing tool it will be broken. I though of adding #ifdef specific for that, but eventually I didn't. Ramon Fried (5): cmd: iotrace: add set region command iotrace: add IO region limit common: iotrace: add timestamp to iotrace records iotrace: move record definitons to header file cmd: iotrace: add dump trace command cmd/iotrace.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++- common/iotrace.c | 53 +++++++++++++++++++++++-------------------- include/iotrace.h | 52 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 26 deletions(-) -- 2.17.0

2 6

[U-Boot] [PATCH v2] arm, imx6: fix NOR/OneNAND boot mode mix-up
by Jay Carlson 25 May '18

25 May '18

From: Jay Carlson <jcarlson(a)unl.edu> This patch fixes the ordering of the EMI enum to match Table 8-8 in the i.MX6ULL Reference Manual, and has been spot-checked in two other i.MX reference manuals for accuracy. Signed-off-by: Jay Carlson <jay.d.carlson(a)gmail.com> --- arch/arm/include/asm/mach-imx/sys_proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index d1d6cbc462..0acc3640f9 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -63,8 +63,8 @@ enum imx6_bmode_serial_rom { }; enum imx6_bmode_emi { - IMX6_BMODE_ONENAND, IMX6_BMODE_NOR, + IMX6_BMODE_ONENAND }; enum imx6_bmode { -- 2.16.1.windows.4

1 0

[U-Boot] [PATCH v2] arm, imx6: add support for SD/MMC Manufacture Mode
by Jay Carlson 25 May '18

25 May '18

From: Jay Carlson <jcarlson(a)unl.edu> This patch adds support for booting blank i.MX6 devices in SD/MMC Manufacture Mode: a fallback mode which the boot ROM enters when no fuses or boot mode pins have been set, the USB serial downloader connection is inactive, and there is an SD card inserted into uSDHC1. The i.MX7 and i.MX8, which both have a Boot_SW_Info data structure which can be parsed to determine boot source, is unaffected by this patch. Signed-off-by: Jay Carlson <jay.d.carlson(a)gmail.com> --- arch/arm/mach-imx/spl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index a20b30d154..8ecae8605c 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -43,6 +43,16 @@ u32 spl_boot_device(void) */ if (is_usbotg_phy_active()) return BOOT_DEVICE_BOARD; + + /** + * To support SD/MMC Manufacture Mode, we check that BOOT_MODE == 0 + * and that BT_FUSE_SEL == 0. If this was disabled via + * blowing DISABLE_SDMMC_MFG, or if SDMMC MFG mode failed, + * we would be in USB download mode, which the previous line would + * have detected. + */ + if (((bmode >> 24) & 0x03) == 0x00 && (bmode >> 4) == 0x00) + return BOOT_DEVICE_MMC1; /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { -- 2.16.1.windows.4

1 0

[U-Boot] Signed FIT image boots without public key
by Nelson, Mark 25 May '18

25 May '18

Let me preface this by saying I'm using the xilinx-u-boot repo based on the 2017.4 tag. I've been studying how to sign FIT images, using mkimage. I successfully signed an image and verified the signature as follows: ${UBTOOLS4}/mkimage -T multi -A arm64 -O linux -f images/linux/fitimage.its -K images/linux/public.dtb -k ${SEC_KEYSTORE} -r images/linux/image_secure.ub ${UBTOOLS4}/fit_check_sign -f images/linux/image_secure.ub -k images/linux/public.dtb I'm signing the configuration in the fitimage.its as follows: conf@1 { description = "Boot Linux kernel with FDT blob + ramdisk"; kernel = "kernel@0"; fdt = "fdt@0"; ramdisk = "ramdisk@0"; signature@1 { algo = "sha256,rsa2048"; key-name-hint = "linux_rsa_priv"; sign-images = "kernel", "fdt", "ramdisk"; }; }; However, when I tested booting the FIT image without providing the public key in Uboots control fdt, it booted successfully. It obviously should not boot a signed image without the key information. When I looked into this, I found that there are two routines called to verify required signatures when booting: fit_image_verify_required_sigs() and fit_config_verify_required_sigs(). The latter is for verifying the signatures in configuration nodes. Each of these routines begins with this logic: /* Work out what we need to verify */ *no_sigsp = 1; sig_node = fdt_subnode_offset(sig_blob, 0, FIT_SIG_NODENAME); if (sig_node < 0) { debug("%s: No signature node found: %s\n", __func__, fdt_strerror(sig_node)); return 0; } The problem is that if the fdt signature node(with the public key info) is not provided, this simply returns 0 for success, and the boot process continues successfully after it checks the hashes of the images. To fix the problem, I simply changed fit_config_verify_required_sigs() to return sig_node instead. If the signature is not there, the returned value is FDT_ERR_NOTFOUND, and the boot processing ends with: Bad Data Hash ERROR: can't get kernel image! Notice that I didn't change the logic in fit_image_verify_required_sigs(), because I'm not including signatures on the images, just hashes. In that case, I want it to ignore the fact that it didn't find a signature node. But surely, this solution is not the correct way. I know that IMAGE_ENABLE_VERIFY is used to gate access to fit_image_verify_required_sigs(), but there is nothing gating access to fit_config_verify_required_sigs() that I can see. I don't see any way to tell u-boot which signature method it should be using to verify: images or configs. It would seem that an additional preprocessor directive is needed. Am I missing something? [cid:image002.png@01D357D5.908FF380]<http://www.commscope.com/> Mark Nelson Principal Engineer CommScope 250 Apollo Drive, Suite 100 Chelmsford, MA 01824 Mobile: 352-444-0150

2 1

[U-Boot] [PATCH] MAINTAINERS: Add board/synopsys/
by Alexey Brodkin 25 May '18

25 May '18

As of today 'board/synopsys/' folder contains only Synopsys ARC boards supported by the same people who support 'arch/arc'. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 5670917b41b9..cc1331f16d6b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -60,6 +60,7 @@ S: Maintained L: uboot-snps-arc(a)synopsys.com T: git git://git.denx.de/u-boot-arc.git F: arch/arc/ +F: board/synopsys/ ARC HSDK CGU CLOCK M: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> -- 2.17.0

1 0

[U-Boot] [PATCH] arm, imx6: fix NOR/OneNAND boot mode mix-up
by Jay Carlson 25 May '18

25 May '18

From: Jay Carlson <jcarlson(a)unl.edu> This patch fixes the ordering of the EMI enum to match Table 8-8 in the the i.MX6ULL Reference Manual, and has been spot-checked in two other i.MX reference manuals for accuracy. --- arch/arm/include/asm/mach-imx/sys_proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index d1d6cbc462..0acc3640f9 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -63,8 +63,8 @@ enum imx6_bmode_serial_rom { }; enum imx6_bmode_emi { - IMX6_BMODE_ONENAND, IMX6_BMODE_NOR, + IMX6_BMODE_ONENAND }; enum imx6_bmode { -- 2.16.1.windows.4

2 1

[U-Boot] [PATCH] arm, imx6: add support for SD/MMC Manufacture Mode
by Jay Carlson 25 May '18

25 May '18

From: Jay Carlson <jcarlson(a)unl.edu> This patch adds support for booting blank i.MX6 devices in SD/MMC Manufacture Mode: a fallback mode which the boot ROM enters when no fuses or boot mode pins have been set, the USB serial downloader connection is inactive, and there is an SD card inserted into uSDHC1. The i.MX7 and i.MX8, which both have a Boot_SW_Info data structure which can be parsed to determine boot source, is unaffected by this patch. --- arch/arm/mach-imx/spl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index a20b30d154..8ecae8605c 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -43,6 +43,16 @@ u32 spl_boot_device(void) */ if (is_usbotg_phy_active()) return BOOT_DEVICE_BOARD; + + /** + * To support SD/MMC Manufacture Mode, we check that BOOT_MODE == 0 + * and that BT_FUSE_SEL == 0. If this was disabled via + * blowing DISABLE_SDMMC_MFG, or if SDMMC MFG mode failed, + * we would be in USB download mode, which the previous line would + * have detected. + */ + if (((bmode >> 24) & 0x03) == 0x00 && (bmode >> 4) == 0x00) + return BOOT_DEVICE_MMC1; /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { -- 2.16.1.windows.4

2 1

[U-Boot] [PATCH 1/1] efi_selftest: imply FAT, FAT_WRITE
by Heinrich Schuchardt 25 May '18

25 May '18

efi_selftest_block_device accesses a FAT file system. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_selftest/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/efi_selftest/Kconfig b/lib/efi_selftest/Kconfig index 3b5f3a1230b..59f9f36801c 100644 --- a/lib/efi_selftest/Kconfig +++ b/lib/efi_selftest/Kconfig @@ -1,6 +1,8 @@ config CMD_BOOTEFI_SELFTEST bool "Allow booting an EFI efi_selftest" depends on CMD_BOOTEFI + imply FAT + imply FAT_WRITE help This adds an EFI test application to U-Boot that can be executed with the 'bootefi selftest' command. It provides extended tests of -- 2.17.0

1 0

[U-Boot] [PATCH] buildman: Add GCC 8.1.0 version to tools from kernel.org
by Alexey Brodkin 25 May '18

25 May '18

Since May 22th toolchains built from GCC 8.1.0 are available at https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/8.1.0/ Unfortunately that pretty trivial bump disclosed a few build issues, see CI job [1] for all the details. That's a brief analysis if of any interest: 1) Wrong use of ARRAY_SIZE in drivers/mtd/nand/atmel_nand.c, see [2]. | arm: + wb45n |+In file included from include/linux/delay.h:6, |+ from include/common.h:26, |+ from drivers/mtd/nand/atmel_nand.c:13: |+drivers/mtd/nand/atmel_nand.c: In function 'pmecc_get_sigma': |+include/linux/kernel.h:46:34: error: division 'sizeof (int16_t * {aka short int *}) / sizeof (int16_t {aka short int})' does not compute the number of array elements [-Werror=sizeof-pointer-div] |+ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) |+ ^ |+drivers/mtd/nand/atmel_nand.c:252:35: note: in expansion of macro 'ARRAY_SIZE' |+ memset(smu, 0, sizeof(int16_t) * ARRAY_SIZE(smu)); |+ ^~~~~~~~~~ |+drivers/mtd/nand/atmel_nand.c:244:11: note: first 'sizeof' operand was declared here |+ int16_t *smu = host->pmecc_smu; |+ ^~~ I guess that's because of 'smu' variable not being an array or a pointer to array. Should be trivial to fix. 2) Issues with .dts on some ARM boards, see [3]: | arm: + vinco |+arch/arm/dts/at91-vinco.dtb: Warning (reg_format): "reg" property in /ahb/apb/timer@fc024000/timer@0 has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) ...and a couple of more of the similar type. 3) Assembler issues on efi-x86, see [4]: | x86: + efi-x86 |+{standard input}: Assembler messages: |+{standard input}:21624: Error: junk at end of line, first unrecognized character is `@' |+{standard input}:21669: Error: junk at end of line, first unrecognized character is `@' |+{standard input}:21624: Error: can't resolve `end.6766' {.u_boot_list_2_fit_loadable_3 section} - `start.6763' {.u_boot_list_2_fit_loadable_1 section} |+{standard input}:21669: Error: can't resolve `end.6766' {.u_boot_list_2_fit_loadable_3 section} - `start.6763' {.u_boot_list_2_fit_loadable_1 section} 4) -Werror=tautological-compare on some PowerPC boards, see [5]: | powerpc: + T1040D4RDB_SPIFLASH |+drivers/net/fm/t1040.c: In function 'fman_port_enet_if': |+drivers/net/fm/t1040.c:19:53: error: bitwise comparison always evaluates to false [-Werror=tautological-compare] |+ ((rcwsr13 & FSL_CORENET_RCWSR13_MAC2_GMII_SEL) == |+ ^~ |+drivers/net/fm/t1040.c:44:48: error: bitwise comparison always evaluates to false [-Werror=tautological-compare] |+ else if ((rcwsr13 & FSL_CORENET_RCWSR13_EC2) == |+ 5) Missing property '#phy-cells' in node in arch/arm/dts/am335x-boneblack.dts, see [6]: | arm: + rastaban pxm2 smartweb etamin thuban draco rut |+arch/arm/dts/am335x-boneblack.dtb: Warning (phys_property): Missing property '#phy-cells' in node /ocp/usb@47400000/usb-phy@47401300 or bad phandle (referred from /ocp/usb@47400000/usb@47401000:phys[0]) [1] https://travis-ci.org/abrodkin/u-boot/builds/383423675 [2] https://travis-ci.org/abrodkin/u-boot/jobs/383423678 [3] https://travis-ci.org/abrodkin/u-boot/jobs/383423695 [4] https://travis-ci.org/abrodkin/u-boot/jobs/383423696 [5] https://travis-ci.org/abrodkin/u-boot/jobs/383423714 [6] https://travis-ci.org/abrodkin/u-boot/jobs/383423717 Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Simon Goldschmidt <sgoldschmidt(a)de.pepperl-fuchs.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Patrice Chotard <patrice.chotard(a)st.com> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Cc: Dmitry Korunov <dessel.k(a)gmail.com> Cc: Alexander Graf <agraf(a)suse.de> Cc: Simon Glass <sjg(a)chromium.org> Cc: Jason Rush <jarush(a)gmail.com> Cc: Scott Wood <oss(a)buserror.net> Cc: Marek Vasut <marex(a)denx.de> --- .travis.yml | 2 +- tools/buildman/toolchain.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 589ca8982443..d5e517574bf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ before_script: - if [[ "${TOOLCHAIN}" == *sh* ]]; then ./tools/buildman/buildman --fetch-arch sh2 ; fi - if [[ "${TOOLCHAIN}" == *x86_64* ]]; then ./tools/buildman/buildman --fetch-arch x86_64; - echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-7.3.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman; + echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-8.1.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman; fi - if [[ "${TOOLCHAIN}" == *arc* ]]; then ./tools/buildman/buildman --fetch-arch arc ; fi - if [[ "${TOOLCHAIN}" == *xtensa* ]]; then diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 4b35f400e97d..0e9f43fd3fcc 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -430,7 +430,7 @@ class Toolchains: """ arch = command.OutputOneLine('uname', '-m') base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' - versions = ['7.3.0', '6.4.0', '4.9.4'] + versions = ['8.1.0', '7.3.0', '6.4.0', '4.9.4'] links = [] for version in versions: url = '%s/%s/%s/' % (base, arch, version) -- 2.17.0

1 0