September 2019 - U-Boot

[U-Boot] [PATCH 1/5] pico-imx7d: Sync pico-hobbit-imx7d_defconfig
by Otavio Salvador 14 Sep '19

14 Sep '19

From: Fabio Berton <fabio.berton(a)ossystems.com.br> Update pico-hobbit-imx7d_defconfig using pico-imx7d_defconfig as base to fix device tree file generation. With this all pico-imx7d are creating u-boot-dtb.img files. Signed-off-by: Fabio Berton <fabio.berton(a)ossystems.com.br> Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- configs/pico-hobbit-imx7d_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig index 3869eb70cc..aaf916c2d0 100644 --- a/configs/pico-hobbit-imx7d_defconfig +++ b/configs/pico-hobbit-imx7d_defconfig @@ -41,7 +41,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hobbit" +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi" CONFIG_DFU_MMC=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x82000000 -- 2.23.0

2 6

Re: [U-Boot] RSA verify code and required keys
by Simon Glass 14 Sep '19

14 Sep '19

Hi Daniele, On Fri, 13 Sep 2019 at 09:50, Daniele Alessandrelli <daniele.alessandrelli(a)gmail.com> wrote: > > Hi, > > I was looking at the RSA image authentication code and I'm a bit > puzzled by the following line of codes in lib/rsa/rsa-verify.c > (https://gitlab.denx.de/u-boot/u-boot/blob/master/lib/rsa/rsa-verify.c#L440): > > 436 /* See if we must use a particular key */ > 437 if (info->required_keynode != -1) { > 438 ret = rsa_verify_with_keynode(info, hash, sig, sig_len, > 439 info->required_keynode); > 440 if (!ret) > 441 return ret; > 442 } > 443 > 444 /* Look for a key that matches our hint */ > 445 snprintf(name, sizeof(name), "key-%s", info->keyname); > 446 node = fdt_subnode_offset(blob, sig_node, name); > 447 ret = rsa_verify_with_keynode(info, hash, sig, sig_len, node); > 448 if (!ret) > 449 return ret; > > If I understand it correctly, at Line 440 we check if verification > with the required key succeeded and if so we return otherwise we > continue, trying other keys. Yes that's my understanding too. > > Is that the intended behavior? Shouldn't the code return in any case > (thus making the FIT verification process fail if the image couldn't > be verified with the required key)? Or am I missing something? Yes I think you are right. The documentation says: - required: If present this indicates that the key must be verified for the image / configuration to be considered valid. Only required keys are normally verified by the FIT image booting algorithm. Valid values are "image" to force verification of all images, and "conf" to force verification of the selected configuration (which then relies on hashes in the images to verify those). The test coverage does not handle that case at present, but it should. Regards, Simon

2 1

[U-Boot] [PATCH] net: Improve documentation for string_to_ip()
by Joe Hershberger 14 Sep '19

14 Sep '19

Signed-off-by: Joe Hershberger <joe.hershberger(a)ni.com> --- include/net.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/net.h b/include/net.h index d054c5f694..a4d0b41b20 100644 --- a/include/net.h +++ b/include/net.h @@ -841,7 +841,14 @@ void string_to_enetaddr(const char *addr, uint8_t *enetaddr); /* Convert an IP address to a string */ void ip_to_string(struct in_addr x, char *s); -/* Convert a string to ip address */ +/** + * string_to_ip() - Convert a string to ip address + * + * Implemented in lib/net_utils.c (built unconditionally) + * + * @s: Input string to parse + * @return: in_addr struct containing the parsed IP address + */ struct in_addr string_to_ip(const char *s); /* Convert a VLAN id to a string */ -- 2.11.0

1 0

[U-Boot] [PATCH v2 00/40] env: common: Remove environment definitions from common.h
by Simon Glass 13 Sep '19

13 Sep '19

At present common.h has a lot of uncommon declarations in it. Many of these would be better placed elsewhere, in header files more related to their purpose. In particular the environnment functions should move to the environment headers. This should reduce the overall amount of code compiled and the length of time taken to build U-Boot. This series splits the current environment.h file into: env.h common definitions widely used in U-Boot; and env_internal.h features internal to the environment drivers, etc. Most files can then include just env.h which is fairly small and does not have any CONFIG magic. At the same time some dead code was noticed in common.h so this series removes some of this. After this series common.h is down to about 400 lines. For reference it was about 1000 lines up until 3 years ago. Changes in v2: - Update to add header to image.c instead of bootm.c - Add new patch to move eth_parse_enetaddr() to net.c/h - Adjust patch to leave eth_parse_enetaddr() alone - Fix typdef typo - Rename ENVF_... flags to ENV_... - Fix 'too' typo in commit message - Rename ENVA_... to ENV_... - Rebase to master Simon Glass (40): common: Move gzip functions into a new gzip header common: Drop the dpram_... functions common: Move lcd_setmem() to lcd.h common: Remove video_setmem() env: Create a new file for environment functions env: Move get_env_id() to env.h env: Move env_get_f() to env.h env: Move env_init() to env.h env: Move env_relocate() to env.h env: Move envmatch() to env.h env: Move env_set_hex() to env.h env: Move env_set_ulong() to env.h env: Move env_get_ulong() to env.h env: Move env_get_yesno() to env.h env: Move env_get_hex() to env.h env: Move env_set() to env.h env: Move env_get() to env.h env: Move eth_env_get/set_enetaddr() to env.h env: net: Move eth_parse_enetaddr() to net.c/h env: Move env_fix_drivers() to env.h env: Move set_default_vars to env.h env: Move env_load/save functions to env.h env: Move env import/export functions to env.h env: Drop env_crc_update() env: Move get/set_default_env() to env.h env: Move env_get_char() to env.h env: Move env_reloc() to env.h env: Rename environment to embedded_environment env: Move env_valid to env.h env: Move callback definitions to env.h env: Drop the ENTRY typedef env: Drop _ENTRY env: Rename the redundancy flags env: Drop the ACTION typedef env: Drop the double underscores in search.h env: Move TOTAL_MALLOC_LEN to environment.h env: Drop environment.h header file where not needed env: Rename environment.h to env_internal.h Drop PCMCIA common: Add a note about the effort to reduce common.h README | 2 +- api/api.c | 7 +- arch/arm/cpu/arm926ejs/spear/spr_misc.c | 2 +- arch/arm/cpu/armv7/vf610/generic.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 3 +- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 3 +- arch/arm/cpu/armv8/fsl-layerscape/spl.c | 1 + arch/arm/lib/bootm.c | 1 + arch/arm/mach-davinci/misc.c | 2 +- arch/arm/mach-imx/cmd_dek.c | 1 - arch/arm/mach-imx/mx6/opos6ul.c | 4 +- arch/arm/mach-imx/mx7/soc.c | 1 + arch/arm/mach-imx/video.c | 1 + arch/arm/mach-kirkwood/cpu.c | 1 + arch/arm/mach-meson/board-common.c | 2 +- arch/arm/mach-omap2/boot-common.c | 1 - arch/arm/mach-omap2/omap3/clock.c | 1 - arch/arm/mach-omap2/utils.c | 2 +- arch/arm/mach-rmobile/cpu_info.c | 1 + arch/arm/mach-rockchip/rk3288/rk3288.c | 1 + arch/arm/mach-socfpga/misc_gen5.c | 1 + arch/arm/mach-socfpga/misc_s10.c | 1 + arch/arm/mach-stm32mp/cpu.c | 2 +- arch/arm/mach-tegra/board2.c | 1 + arch/arm/mach-tegra/cboot.c | 2 +- arch/arm/mach-uniphier/board_late_init.c | 1 + arch/arm/mach-uniphier/mmc-first-dev.c | 1 + arch/m68k/lib/bootm.c | 2 +- arch/microblaze/lib/bootm.c | 1 + arch/mips/lib/bootm.c | 1 + arch/nds32/include/asm/u-boot.h | 1 - arch/nds32/lib/bootm.c | 1 + arch/powerpc/cpu/mpc85xx/cpu_init.c | 1 + arch/powerpc/cpu/mpc85xx/fdt.c | 2 +- arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 1 + arch/powerpc/cpu/mpc85xx/mp.c | 2 + arch/powerpc/lib/bootm.c | 2 +- arch/riscv/include/asm/u-boot.h | 1 - arch/x86/cpu/qemu/e820.c | 1 + arch/x86/lib/zimage.c | 1 + arch/xtensa/lib/bootm.c | 1 + board/Arcturus/ucp1020/cmd_arc.c | 2 +- board/Arcturus/ucp1020/spl.c | 3 +- board/Arcturus/ucp1020/ucp1020.c | 1 + board/BuR/brppt1/board.c | 1 + board/BuR/brxre1/board.c | 1 + board/BuR/common/br_resetc.c | 1 + board/BuR/common/common.c | 1 + board/BuS/eb_cpu5282/eb_cpu5282.c | 1 + board/CZ.NIC/turris_mox/turris_mox.c | 2 +- board/CZ.NIC/turris_omnia/turris_omnia.c | 2 +- board/CarMediaLab/flea3/flea3.c | 1 + board/LaCie/net2big_v2/net2big_v2.c | 2 +- board/LaCie/netspace_v2/netspace_v2.c | 2 +- board/Synology/ds414/cmd_syno.c | 1 + board/alliedtelesis/x530/x530.c | 1 + board/amazon/kc1/kc1.c | 1 + board/amlogic/p200/p200.c | 2 +- board/amlogic/p201/p201.c | 2 +- board/amlogic/p212/p212.c | 2 +- board/amlogic/q200/q200.c | 2 +- board/amlogic/s400/s400.c | 1 - board/amlogic/u200/u200.c | 1 - board/aristainetos/aristainetos-v2.c | 1 + board/armadeus/apf27/apf27.c | 1 - board/armltd/integrator/integrator.c | 1 + board/atmel/common/board.c | 1 + board/atmel/common/mac_eeprom.c | 2 +- board/atmel/sama5d3xek/sama5d3xek.c | 1 + board/bachmann/ot1200/ot1200.c | 1 + board/birdland/bav335x/board.c | 4 +- board/bluegiga/apx4devkit/apx4devkit.c | 1 + board/bluewater/gurnard/gurnard.c | 1 + board/bosch/guardian/board.c | 3 +- board/bosch/shc/board.c | 4 +- board/boundary/nitrogen6x/nitrogen6x.c | 1 + board/broadcom/bcm23550_w1d/bcm23550_w1d.c | 1 + board/broadcom/bcm28155_ap/bcm28155_ap.c | 1 + board/broadcom/bcmstb/bcmstb.c | 1 + board/buffalo/lsxl/lsxl.c | 3 +- board/cadence/xtfpga/xtfpga.c | 1 + board/ccv/xpress/xpress.c | 1 + board/compulab/cl-som-imx7/cl-som-imx7.c | 2 +- board/compulab/cm_fx6/cm_fx6.c | 2 +- board/compulab/cm_t335/cm_t335.c | 2 +- board/compulab/cm_t35/cm_t35.c | 2 +- board/compulab/cm_t54/cm_t54.c | 2 +- board/compulab/common/omap3_display.c | 1 + board/congatec/cgtqmx6eval/cgtqmx6eval.c | 1 + board/cssi/MCR3000/MCR3000.c | 1 + board/davinci/da8xxevm/da850evm.c | 2 +- board/davinci/da8xxevm/omapl138_lcdk.c | 1 + board/dhelectronics/dh_imx6/dh_imx6.c | 2 +- board/eets/pdu001/board.c | 2 +- board/el/el6x/el6x.c | 1 + board/emulation/qemu-riscv/qemu-riscv.c | 1 + board/engicam/common/board.c | 1 + board/esd/meesc/meesc.c | 1 + board/freescale/b4860qds/b4860qds.c | 1 + board/freescale/b4860qds/spl.c | 3 +- board/freescale/bsc9131rdb/bsc9131rdb.c | 1 + board/freescale/bsc9132qds/bsc9132qds.c | 1 + board/freescale/c29xpcie/c29xpcie.c | 1 + board/freescale/c29xpcie/spl.c | 2 +- board/freescale/common/cmd_esbc_validate.c | 1 + board/freescale/common/fsl_chain_of_trust.c | 1 + board/freescale/common/sys_eeprom.c | 1 + board/freescale/common/vid.c | 1 + board/freescale/corenet_ds/corenet_ds.c | 1 + board/freescale/imx8mq_evk/imx8mq_evk.c | 1 + board/freescale/imx8qm_mek/imx8qm_mek.c | 2 +- board/freescale/imx8qxp_mek/imx8qxp_mek.c | 2 +- board/freescale/ls1012afrdm/ls1012afrdm.c | 2 +- board/freescale/ls1012aqds/ls1012aqds.c | 2 +- board/freescale/ls1012ardb/ls1012ardb.c | 2 +- board/freescale/ls1028a/ls1028a.c | 2 +- board/freescale/ls1088a/eth_ls1088aqds.c | 1 + board/freescale/ls1088a/ls1088a.c | 3 +- board/freescale/ls2080a/ls2080a.c | 2 +- board/freescale/ls2080aqds/eth.c | 1 + board/freescale/ls2080aqds/ls2080aqds.c | 3 +- board/freescale/ls2080ardb/ls2080ardb.c | 3 +- board/freescale/lx2160a/eth_lx2160aqds.c | 1 + board/freescale/lx2160a/lx2160a.c | 2 +- board/freescale/mpc8323erdb/mpc8323erdb.c | 1 + board/freescale/mpc837xemds/pci.c | 1 + board/freescale/mpc837xerdb/mpc837xerdb.c | 1 + board/freescale/mpc8572ds/mpc8572ds.c | 1 + board/freescale/mx51evk/mx51evk_video.c | 1 + board/freescale/mx53loco/mx53loco.c | 1 + board/freescale/mx53loco/mx53loco_video.c | 1 + board/freescale/mx6sabreauto/mx6sabreauto.c | 1 + board/freescale/mx6sabresd/mx6sabresd.c | 1 + board/freescale/mx6sxsabresd/mx6sxsabresd.c | 1 + .../mx6ul_14x14_evk/mx6ul_14x14_evk.c | 1 + board/freescale/mx6ullevk/mx6ullevk.c | 1 + board/freescale/p1010rdb/p1010rdb.c | 1 + board/freescale/p1010rdb/spl.c | 3 +- board/freescale/p1022ds/p1022ds.c | 1 + board/freescale/p1022ds/spl.c | 3 +- board/freescale/p1023rdb/p1023rdb.c | 1 + board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 1 + board/freescale/p1_p2_rdb_pc/spl.c | 3 +- board/freescale/p1_twr/p1_twr.c | 1 + board/freescale/p2041rdb/p2041rdb.c | 1 + board/freescale/qemu-ppce500/qemu-ppce500.c | 1 + board/freescale/t102xqds/spl.c | 2 +- board/freescale/t102xqds/t102xqds.c | 1 + board/freescale/t102xrdb/spl.c | 2 +- board/freescale/t102xrdb/t102xrdb.c | 1 + board/freescale/t1040qds/t1040qds.c | 1 + board/freescale/t104xrdb/spl.c | 2 +- board/freescale/t104xrdb/t104xrdb.c | 1 + board/freescale/t208xqds/spl.c | 2 +- board/freescale/t208xqds/t208xqds.c | 1 + board/freescale/t208xrdb/spl.c | 2 +- board/freescale/t208xrdb/t208xrdb.c | 1 + board/freescale/t4qds/spl.c | 2 +- board/freescale/t4qds/t4240emu.c | 1 + board/freescale/t4qds/t4240qds.c | 1 + board/freescale/t4rdb/spl.c | 2 +- board/freescale/t4rdb/t4240rdb.c | 1 + board/gardena/smart-gateway-at91sam/board.c | 1 + board/gardena/smart-gateway-mt7688/board.c | 3 +- board/gateworks/gw_ventana/common.c | 1 + board/gateworks/gw_ventana/gw_ventana.c | 2 +- board/gateworks/gw_ventana/gw_ventana_spl.c | 3 +- board/gdsys/a38x/keyprogram.c | 1 + board/gdsys/mpc8308/gazerbeam.c | 1 + board/gdsys/mpc8308/hrcon.c | 1 + board/gdsys/mpc8308/strider.c | 1 + board/gdsys/p1022/controlcenterd-id.c | 1 + board/gdsys/p1022/controlcenterd.c | 1 + board/ge/bx50v3/bx50v3.c | 1 + board/ge/common/ge_common.c | 1 + board/ge/mx53ppd/mx53ppd.c | 2 +- board/grinn/chiliboard/board.c | 2 +- board/grinn/liteboard/board.c | 1 + board/gumstix/pepper/board.c | 2 +- board/highbank/highbank.c | 1 + board/hisilicon/poplar/poplar.c | 1 + board/imgtec/ci20/ci20.c | 2 +- board/intel/edison/edison.c | 2 +- board/isee/igep003x/board.c | 2 +- board/isee/igep00x0/igep00x0.c | 1 + board/k+p/kp_imx53/kp_id_rev.c | 2 +- board/k+p/kp_imx53/kp_imx53.c | 1 + board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 1 + board/keymile/common/common.c | 1 + board/keymile/common/ivm.c | 1 + board/keymile/km83xx/km83xx.c | 1 + board/keymile/km_arm/km_arm.c | 1 + board/keymile/kmp204x/kmp204x.c | 1 + board/kosagi/novena/novena.c | 2 +- board/laird/wb50n/wb50n.c | 1 + board/lg/sniper/sniper.c | 1 + board/liebherr/display5/display5.c | 2 +- board/liebherr/display5/spl.c | 2 +- board/liebherr/mccmon6/mccmon6.c | 1 + board/logicpd/imx6/imx6logic.c | 1 + board/logicpd/zoom1/zoom1.c | 2 +- board/menlo/m53menlo/m53menlo.c | 2 + board/micronas/vct/vct.c | 1 + board/mscc/ocelot/ocelot.c | 1 - board/nokia/rx51/rx51.c | 1 + board/nvidia/p2371-2180/p2371-2180.c | 2 +- board/nvidia/p2771-0000/p2771-0000.c | 2 +- board/overo/overo.c | 1 + board/phytec/pcm051/board.c | 2 +- board/phytec/pcm052/pcm052.c | 4 +- board/phytec/pfla02/pfla02.c | 1 + board/phytec/phycore_rk3288/phycore-rk3288.c | 4 +- .../dragonboard410c/dragonboard410c.c | 2 +- .../dragonboard820c/dragonboard820c.c | 1 + board/raspberrypi/rpi/rpi.c | 2 +- board/renesas/alt/alt.c | 3 +- board/renesas/blanche/blanche.c | 2 +- board/renesas/gose/gose.c | 3 +- board/renesas/koelsch/koelsch.c | 3 +- board/renesas/lager/lager.c | 3 +- board/renesas/porter/porter.c | 3 +- board/renesas/sh7752evb/sh7752evb.c | 2 +- board/renesas/sh7753evb/sh7753evb.c | 2 +- board/renesas/sh7757lcr/sh7757lcr.c | 2 +- board/renesas/silk/silk.c | 3 +- board/renesas/stout/stout.c | 3 +- board/rockchip/tinker_rk3288/tinker-rk3288.c | 2 +- board/samsung/common/exynos5-dt.c | 1 + board/samsung/common/misc.c | 1 + board/samsung/odroid/odroid.c | 1 + board/samsung/trats/trats.c | 1 + board/samsung/universal_c210/universal.c | 1 + board/samtec/vining_fpga/socfpga.c | 2 +- board/siemens/common/board.c | 1 + board/siemens/common/factoryset.c | 2 +- board/siemens/draco/board.c | 1 + board/siemens/pxm2/board.c | 2 +- board/siemens/rut/board.c | 1 + board/siemens/taurus/taurus.c | 2 +- board/silica/pengwyn/board.c | 2 +- board/socrates/socrates.c | 1 + board/softing/vining_2000/vining_2000.c | 2 +- board/solidrun/mx6cuboxi/mx6cuboxi.c | 1 + board/st/stm32mp1/stm32mp1.c | 3 +- board/sunxi/board.c | 3 +- board/synopsys/hsdk/env-lib.c | 1 + board/synopsys/hsdk/hsdk.c | 1 + board/tcl/sl50/board.c | 4 +- board/technologic/ts4800/ts4800.c | 2 +- .../puma_rk3399/puma-rk3399.c | 2 +- board/ti/am335x/board.c | 4 +- board/ti/am43xx/board.c | 2 +- board/ti/am57xx/board.c | 2 +- board/ti/am65x/evm.c | 1 + board/ti/beagle/beagle.c | 1 + board/ti/common/board_detect.c | 1 + board/ti/dra7xx/evm.c | 2 +- board/ti/evm/evm.c | 1 + board/ti/ks2_evm/board.c | 1 + board/ti/ks2_evm/board_k2g.c | 1 + board/ti/panda/panda.c | 1 + board/ti/ti814x/evm.c | 2 +- board/ti/ti816x/evm.c | 2 +- board/timll/devkit8000/devkit8000.c | 2 +- board/toradex/apalis-imx8/apalis-imx8.c | 2 +- board/toradex/apalis_imx6/apalis_imx6.c | 2 +- .../toradex/colibri-imx6ull/colibri-imx6ull.c | 1 + board/toradex/colibri-imx8x/colibri-imx8x.c | 2 +- board/toradex/colibri_imx6/colibri_imx6.c | 2 +- board/toradex/colibri_vf/colibri_vf.c | 1 + board/toradex/common/tdx-cfg-block.c | 1 + board/toradex/common/tdx-common.c | 2 +- board/tqc/tqma6/tqma6.c | 1 + board/udoo/neo/neo.c | 1 + board/udoo/udoo.c | 1 + board/varisys/common/sys_eeprom.c | 1 + board/varisys/cyrus/cyrus.c | 1 + board/vscom/baltos/board.c | 2 +- board/wandboard/wandboard.c | 1 + board/warp7/warp7.c | 1 + .../work_92105/work_92105_display.c | 1 + board/xes/common/board.c | 1 + board/xilinx/zynq/board.c | 1 + board/xilinx/zynqmp/cmds.c | 1 + board/xilinx/zynqmp/zynqmp.c | 1 + cmd/Kconfig | 8 - cmd/Makefile | 1 - cmd/aes.c | 1 - cmd/avb.c | 1 + cmd/bdinfo.c | 1 + cmd/binop.c | 1 + cmd/blob.c | 1 - cmd/bmp.c | 8 +- cmd/bootefi.c | 1 + cmd/bootm.c | 2 +- cmd/bootmenu.c | 1 + cmd/cbfs.c | 1 + cmd/config.c | 1 + cmd/cramfs.c | 1 + cmd/dtimg.c | 1 + cmd/efidebug.c | 1 - cmd/elf.c | 2 +- cmd/ethsw.c | 2 +- cmd/fdt.c | 1 + cmd/fpga.c | 2 + cmd/gpt.c | 1 + cmd/i2c.c | 1 - cmd/ide.c | 4 - cmd/ini.c | 2 +- cmd/itest.c | 1 + cmd/jffs2.c | 1 + cmd/license.c | 1 + cmd/load.c | 1 + cmd/lzmadec.c | 1 + cmd/md5sum.c | 1 + cmd/mtdparts.c | 1 + cmd/mvebu/bubt.c | 1 + cmd/nand.c | 1 + cmd/net.c | 1 + cmd/nvedit.c | 57 +-- cmd/nvedit_efi.c | 1 + cmd/part.c | 1 + cmd/pcmcia.c | 341 ------------------ cmd/pxe.c | 1 + cmd/qfw.c | 1 + cmd/reiser.c | 1 + cmd/setexpr.c | 1 + cmd/source.c | 1 + cmd/spl.c | 1 + cmd/tpm-common.c | 1 + cmd/tpm-v1.c | 1 + cmd/tpm_test.c | 1 - cmd/trace.c | 1 + cmd/ubi.c | 1 + cmd/unzip.c | 2 + cmd/ximg.c | 2 + cmd/zfs.c | 1 + cmd/zip.c | 1 + common/autoboot.c | 1 + common/board_f.c | 11 +- common/board_r.c | 17 +- common/bootm.c | 1 + common/bootm_os.c | 1 + common/bootretry.c | 1 + common/cli.c | 1 + common/cli_hush.c | 1 + common/cli_simple.c | 1 + common/command.c | 1 + common/console.c | 3 +- common/fdt_support.c | 1 + common/hash.c | 1 + common/hwconfig.c | 1 + common/image-android.c | 1 + common/image-fdt.c | 1 + common/image.c | 3 +- common/main.c | 1 + common/spl/spl_dfu.c | 4 +- common/spl/spl_ext.c | 1 + common/spl/spl_fat.c | 1 + common/spl/spl_fit.c | 1 + common/spl/spl_net.c | 1 + common/spl/spl_ymodem.c | 1 + common/splash.c | 1 + common/splash_source.c | 1 + common/update.c | 1 + common/usb_hub.c | 1 + common/usb_kbd.c | 1 + disk/part.c | 1 + disk/part_amiga.c | 1 + doc/README.marubun-pcmcia | 65 ---- doc/README.ne2000 | 11 - drivers/Kconfig | 2 - drivers/Makefile | 1 - drivers/bootcount/bootcount_env.c | 2 +- drivers/ddr/fsl/fsl_ddr_gen4.c | 1 + drivers/ddr/fsl/interactive.c | 1 + drivers/ddr/fsl/options.c | 1 + drivers/dfu/dfu.c | 1 + drivers/fastboot/fb_command.c | 1 + drivers/fastboot/fb_common.c | 1 + drivers/fastboot/fb_getvar.c | 1 + drivers/fastboot/fb_mmc.c | 1 + drivers/input/i8042.c | 1 + drivers/input/input.c | 1 + drivers/misc/fs_loader.c | 1 + drivers/mtd/cfi_flash.c | 3 +- drivers/mtd/jedec_flash.c | 1 - drivers/mtd/mtd_uboot.c | 1 + drivers/net/dc2114x.c | 1 + drivers/net/fec_mxc.c | 2 +- drivers/net/fm/b4860.c | 1 + drivers/net/fm/fdt.c | 1 + drivers/net/fm/fm.c | 2 +- drivers/net/fsl-mc/mc.c | 1 + drivers/net/fsl_mcdmafec.c | 2 +- drivers/net/ftmac100.c | 1 + drivers/net/lan91c96.c | 1 + drivers/net/mcffec.c | 2 +- drivers/net/ne2000_base.c | 12 +- drivers/net/netconsole.c | 5 +- drivers/net/phy/micrel_ksz90x1.c | 1 + drivers/net/sandbox-raw.c | 1 + drivers/net/sh_eth.c | 2 +- drivers/net/ti/cpsw-common.c | 1 - drivers/pci/fsl_pci_init.c | 1 + drivers/pci/pci.c | 1 + drivers/pci/pci_common.c | 1 + drivers/pcmcia/Kconfig | 0 drivers/pcmcia/Makefile | 6 - drivers/pcmcia/marubun_pcmcia.c | 99 ----- drivers/qe/qe.c | 1 - drivers/reset/reset-socfpga.c | 1 + drivers/rtc/m41t60.c | 1 + drivers/scsi/scsi.c | 1 + drivers/serial/serial-uclass.c | 2 +- drivers/serial/serial.c | 2 +- drivers/serial/usbtty.c | 1 + drivers/tee/sandbox.c | 8 +- drivers/usb/gadget/designware_udc.c | 1 + drivers/usb/gadget/ether.c | 2 +- drivers/usb/gadget/f_dfu.c | 1 + drivers/usb/gadget/f_fastboot.c | 1 + drivers/usb/gadget/f_rockusb.c | 1 + drivers/usb/gadget/f_sdp.c | 1 + drivers/usb/host/ehci-fsl.c | 1 + drivers/video/ati_radeon_fb.c | 1 + drivers/video/cfb_console.c | 2 + drivers/video/mb862xx.c | 1 + drivers/video/mx3fb.c | 1 + drivers/video/mxsfb.c | 1 + drivers/video/videomodes.c | 1 + env/callback.c | 11 +- env/common.c | 21 +- env/eeprom.c | 13 +- env/embedded.c | 2 +- env/env.c | 3 +- env/ext4.c | 5 +- env/fat.c | 5 +- env/flags.c | 15 +- env/flash.c | 23 +- env/mmc.c | 7 +- env/nand.c | 9 +- env/nowhere.c | 3 +- env/nvram.c | 3 +- env/onenand.c | 2 +- env/remote.c | 2 +- env/sata.c | 5 +- env/sf.c | 19 +- env/ubi.c | 9 +- examples/api/demo.c | 1 + examples/api/glue.c | 3 +- fs/fs.c | 1 + fs/ubifs/ubifs.c | 2 + include/bootcount.h | 1 + include/command.h | 1 + include/common.h | 191 +--------- include/env.h | 335 +++++++++++++++++ include/env_callback.h | 25 +- include/env_default.h | 2 +- include/env_flags.h | 7 +- include/{environment.h => env_internal.h} | 110 ++---- include/exports.h | 1 + include/gzip.h | 103 ++++++ include/lcd.h | 1 + include/net.h | 12 + include/pcmcia.h | 137 ------- include/pcmcia/yenta.h | 156 -------- include/search.h | 77 ++-- lib/efi_loader/efi_boottime.c | 1 - lib/efi_loader/efi_console.c | 1 + lib/efi_loader/efi_variable.c | 3 +- lib/fdtdec.c | 2 + lib/gunzip.c | 5 +- lib/gzip.c | 1 + lib/hashtable.c | 66 ++-- lib/smbios.c | 1 + lib/uuid.c | 1 + net/bootp.c | 1 + net/dns.c | 1 + net/eth-uclass.c | 2 +- net/eth_common.c | 4 +- net/eth_legacy.c | 2 +- net/link_local.c | 1 + net/net.c | 15 +- net/tftp.c | 1 + net/wol.c | 2 +- post/post.c | 1 + scripts/config_whitelist.txt | 6 - test/compression.c | 1 + test/dm/eth.c | 1 + test/env/hashtable.c | 20 +- tools/env/fw_env.c | 24 +- tools/env/fw_env.h | 1 + tools/env/fw_env_main.c | 1 + tools/envcrc.c | 6 +- 495 files changed, 1196 insertions(+), 1554 deletions(-) delete mode 100644 cmd/pcmcia.c delete mode 100644 doc/README.marubun-pcmcia delete mode 100644 drivers/pcmcia/Kconfig delete mode 100644 drivers/pcmcia/Makefile delete mode 100644 drivers/pcmcia/marubun_pcmcia.c create mode 100644 include/env.h rename include/{environment.h => env_internal.h} (75%) create mode 100644 include/gzip.h delete mode 100644 include/pcmcia.h delete mode 100644 include/pcmcia/yenta.h -- 2.22.0.709.g102302147b-goog

5 94

[U-Boot] rk3288: HDMI out causing boot hang
by Jagan Teki 13 Sep '19

13 Sep '19

Hi All, Did anyone tried HDMI out on rk3288? Enabling HDMI out causing boot hang, during stdout initialization from console.c Enabled below configs and stdin/out/err environment to probe the DM_VIDEO, seems like the console initialization hangs during stdout initialization. Log: Model: Tinker-RK3288 DRAM: 2 GiB MMC: dwmmc@ff0c0000: 1 Loading Environment from MMC... OK 1. console_init_r 2. console_init_r 2.1 console_init_r rk3288_vop_probe vop@ff930000: probing regulator 'vcc18_lcd' vop@ff930000: probing regulator 'VCC18_LCD' vop@ff930000: probing regulator 'vdd10_lcd_pwren_h' vop@ff930000: probing regulator 'vdd10_lcd' vop@ff930000: probing regulator 'VDD10_LCD' vop@ff930000: probing regulator 'vcc33_lcd' rk_display_init(vop@ff930000, 2139095040, endpoint@0) vop_id=0 remote vop_id=0 rk_display_init(vop@ff930000): no UCLASS_DISPLAY for remote-endpoint Device failed: ret=-22 rk_display_init(vop@ff930000, 2139095040, endpoint@1) vop_id=1 remote vop_id=0 Found device 'hdmi@ff980000', disp_uc_priv=7cf71710 rk3288_hdmi_probe hdmi@ff980000: probing regulator 'vcc50_hdmi' rk_hdmi_probe: 1 rk_hdmi_probe: 2 rk_hdmi_probe: done! fb=7f800000, size=2560 1440 rk3288_vop_probe done! Changes: +CONFIG_DM_VIDEO=y +CONFIG_DISPLAY=y +CONFIG_VIDEO_ROCKCHIP=y +CONFIG_DISPLAY_ROCKCHIP_HDMI=y +CONFIG_CONSOLE_SCROLL_LINES=10 +#define ROCKCHIP_DEVICE_SETTINGS \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" Any inputs? Jagan.

4 6

[U-Boot] [PATCH] cmd: mdio/mii: add Kconfig help and allow break dependency
by Ramon Fried 13 Sep '19

13 Sep '19

* Add Kconfig help describing the purpose of each command. * Add CONFIG_CMD_MDIO so it could be selected individually, as it doesn't depend on the mii command. * Add Kconfig imply to mii to automatically select the mdio command. Signed-off-by: Ramon Fried <rfried.dev(a)gmail.com> --- cmd/Kconfig | 18 ++++++++++++++++-- cmd/Makefile | 4 +--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 98647f58b7..cfb3b58119 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1410,8 +1410,22 @@ config CMD_NFS config CMD_MII bool "mii" - help - Enable MII utility commands. + imply CMD_MDIO + help + If set, allows 802.3(clause 22) MII Management functions interface access + The management interface specified in Clause 22 provides + a simple, two signal, serial interface to connect a + Station Management entity and a managed PHY for providing access + to management parameters and services. + The interface is referred to as the MII management interface. + +config CMD_MDIO + bool "mdio" + depends on PHYLIB + help + If set, allows Enable 802.3(clause 45) MDIO interface registers access + The MDIO interface is orthogonal to the MII interface and extends + it by adding access to more registers through indirect addressing. config CMD_PING bool "ping" diff --git a/cmd/Makefile b/cmd/Makefile index ac843b4b16..384ddb8eaf 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -89,9 +89,7 @@ obj-$(CONFIG_CMD_MEMORY) += mem.o obj-$(CONFIG_CMD_IO) += io.o obj-$(CONFIG_CMD_MFSL) += mfsl.o obj-$(CONFIG_CMD_MII) += mii.o -ifdef CONFIG_PHYLIB -obj-$(CONFIG_CMD_MII) += mdio.o -endif +obj-$(CONFIG_CMD_MDIO) += mdio.o obj-$(CONFIG_CMD_MISC) += misc.o obj-$(CONFIG_CMD_MMC) += mmc.o obj-$(CONFIG_MP) += mp.o -- 2.23.0

2 1

[U-Boot] [PATCH 1/1] efi_loader: incorrect return value form DisconnectController
by Heinrich Schuchardt 13 Sep '19

13 Sep '19

DisconnectController() should never return EFI_NOT_FOUND. If EFI_DRIVER_BINDING_PROTOCOL.Stop() fails, return EFI_DEVICE_ERROR. If the driver handle does not expose the EFI_DRIVER_BINDING_PROTOCOL return EFI_INVALID_PARAMETER. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_boottime.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index b9bff894cb..493d906c64 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -3499,7 +3499,6 @@ static efi_status_t EFIAPI efi_disconnect_controller( efi_handle_t *child_handle_buffer = NULL; size_t number_of_children = 0; efi_status_t r; - size_t stop_count = 0; struct efi_object *efiobj; EFI_ENTRY("%p, %p, %p", controller_handle, driver_image_handle, @@ -3539,32 +3538,35 @@ static efi_status_t EFIAPI efi_disconnect_controller( (void **)&binding_protocol, driver_image_handle, NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL)); - if (r != EFI_SUCCESS) + if (r != EFI_SUCCESS) { + r = EFI_INVALID_PARAMETER; goto out; + } /* Remove the children */ if (number_of_children) { r = EFI_CALL(binding_protocol->stop(binding_protocol, controller_handle, number_of_children, child_handle_buffer)); - if (r == EFI_SUCCESS) - ++stop_count; + if (r != EFI_SUCCESS) { + r = EFI_DEVICE_ERROR; + goto out; + } } /* Remove the driver */ - if (!child_handle) + if (!child_handle) { r = EFI_CALL(binding_protocol->stop(binding_protocol, controller_handle, 0, NULL)); - if (r == EFI_SUCCESS) - ++stop_count; + if (r != EFI_SUCCESS) { + r = EFI_DEVICE_ERROR; + goto out; + } + } EFI_CALL(efi_close_protocol(driver_image_handle, &efi_guid_driver_binding_protocol, driver_image_handle, NULL)); - - if (stop_count) - r = EFI_SUCCESS; - else - r = EFI_NOT_FOUND; + r = EFI_SUCCESS; out: if (!child_handle) free(child_handle_buffer); -- 2.20.1

1 0

[U-Boot] RSA verify code and required keys
by Daniele Alessandrelli 13 Sep '19

13 Sep '19

Hi, I was looking at the RSA image authentication code and I'm a bit puzzled by the following line of codes in lib/rsa/rsa-verify.c (https://gitlab.denx.de/u-boot/u-boot/blob/master/lib/rsa/rsa-verify.c#L440): 436 /* See if we must use a particular key */ 437 if (info->required_keynode != -1) { 438 ret = rsa_verify_with_keynode(info, hash, sig, sig_len, 439 info->required_keynode); 440 if (!ret) 441 return ret; 442 } 443 444 /* Look for a key that matches our hint */ 445 snprintf(name, sizeof(name), "key-%s", info->keyname); 446 node = fdt_subnode_offset(blob, sig_node, name); 447 ret = rsa_verify_with_keynode(info, hash, sig, sig_len, node); 448 if (!ret) 449 return ret; If I understand it correctly, at Line 440 we check if verification with the required key succeeded and if so we return otherwise we continue, trying other keys. Is that the intended behavior? Shouldn't the code return in any case (thus making the FIT verification process fail if the image couldn't be verified with the required key)? Or am I missing something? Regards, Daniele

1 0

[U-Boot] Saving u-boot environment on LS1046ardb QSPI bricks flash memory
by Matthew Ratson 13 Sep '19

13 Sep '19

Hi there, I am currently working with a LS1046ardb development board from NXP/Layerscape. Using their provided firmware image from the primary QSPI memory bank, I have tried to flash my own compiled u-boot (using the ls1046ardb_qspi_defconfig file) onto the alternate memory bank. I have also flashed a Reset Configuration Word (RCW) which was provided by NXP. This process is successful and the alternate bank boots into u-boot. However, I discovered that after simply executing a "saveenv" command and then rebooting again into the alternate bank, the alternate flash memory seems to be "bricked". I can no longer boot into the alternate bank and instead, the board will boot into the default bank. I am wondering if this issue and has been noticed already by someone or if there is something I am not doing correctly. Is their a specific denx RCW that I should use instead, rather than the one provided by NXP? Any help would be greatly appreciated!

2 2

[U-Boot] [PATCH v2] cmd: env: extend "env [set|print] -e" to manage UEFI variables
by AKASHI Takahiro 13 Sep '19

13 Sep '19

With this patch, when setting UEFI variable with "env set -e" command, we will be able to - specify vendor guid with "-guid guid", - specify variable attributes, BOOTSERVICE_ACCESS, RUNTIME_ACCESS, respectively with "-bs" and "-rt", - append a value instead of overwriting with "-a", - use memory as variable's value instead of explicit values given at the command line with "-i address,size" If guid is not explicitly given, default value will be used. When "-at" is given, a variable should be authenticated with appropriate signature database before setting or modifying its value. (Authentication is not supported yet though.) Meanwhile, "env print -e," will be modified so that it will dump a variable's value only if '-v' (verbose) is specified. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- Changes in v2 (Sept 6, 2019) * remove "-at" option --- cmd/nvedit.c | 19 +++-- cmd/nvedit_efi.c | 189 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 168 insertions(+), 40 deletions(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 1cb0bc1460b9..1e542972db30 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -1387,7 +1387,7 @@ static char env_help_text[] = #endif "env print [-a | name ...] - print environment\n" #if defined(CONFIG_CMD_NVEDIT_EFI) - "env print -e [name ...] - print UEFI environment\n" + "env print -e [-v] [name ...] - print UEFI environment\n" #endif #if defined(CONFIG_CMD_RUN) "env run var [...] - run commands in an environment variable\n" @@ -1399,7 +1399,8 @@ static char env_help_text[] = #endif #endif #if defined(CONFIG_CMD_NVEDIT_EFI) - "env set -e name [arg ...] - set UEFI variable; unset if 'arg' not specified\n" + "env set -e [-nv][-bs][-rt][-a][-i addr,size][-v] name [arg ...]\n" + " - set UEFI variable; unset if '-i' or 'arg' not specified\n" #endif "env set [-f] name [arg ...]\n"; #endif @@ -1428,8 +1429,9 @@ U_BOOT_CMD_COMPLETE( "print environment variables", "[-a]\n - print [all] values of all environment variables\n" #if defined(CONFIG_CMD_NVEDIT_EFI) - "printenv -e [name ...]\n" + "printenv -e [-v] [name ...]\n" " - print UEFI variable 'name' or all the variables\n" + " \"-v\": verbose for signature database\n" #endif "printenv name ...\n" " - print value of environment variable 'name'", @@ -1459,9 +1461,16 @@ U_BOOT_CMD_COMPLETE( setenv, CONFIG_SYS_MAXARGS, 0, do_env_set, "set environment variables", #if defined(CONFIG_CMD_NVEDIT_EFI) - "-e [-nv] name [value ...]\n" + "-e [-guid guid][-nv][-bs][-rt][-a][-v]\n" + " [-i addr,size name], or [name [value ...]]\n" " - set UEFI variable 'name' to 'value' ...'\n" - " 'nv' option makes the variable non-volatile\n" + " \"-guid\": set vendor guid\n" + " \"-nv\": set non-volatile attribute\n" + " \"-bs\": set boot-service attribute\n" + " \"-rt\": set runtime attribute\n" + " \"-a\": append-write\n" + " \"-i addr,size\": use <addr,size> as variable's value\n" + " \"-v\": verbose print\n" " - delete UEFI variable 'name' if 'value' not specified\n" #endif "setenv [-f] name value ...\n" diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c index ed6d09a53046..67e732e8d520 100644 --- a/cmd/nvedit_efi.c +++ b/cmd/nvedit_efi.c @@ -13,6 +13,7 @@ #include <exports.h> #include <hexdump.h> #include <malloc.h> +#include <mapmem.h> #include <linux/kernel.h> /* @@ -34,15 +35,48 @@ static const struct { {EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS, "AT"}, }; +static const struct { + efi_guid_t guid; + char *text; +} efi_guid_text[] = { + /* signature database */ + {EFI_GLOBAL_VARIABLE_GUID, "EFI_GLOBAL_VARIABLE_GUID"}, +}; + +/* "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" */ +static char unknown_guid[37]; + +/** + * efi_guid_to_str() - convert guid to readable name + * + * @guid: GUID + * Return: string for GUID + * + * convert guid to readable name + */ +static const char *efi_guid_to_str(efi_guid_t *guid) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(efi_guid_text); i++) + if (!guidcmp(guid, &efi_guid_text[i].guid)) + return efi_guid_text[i].text; + + uuid_bin_to_str(guid->b, unknown_guid, UUID_STR_FORMAT_GUID); + + return unknown_guid; +} + /** * efi_dump_single_var() - show information about a UEFI variable * * @name: Name of the variable * @guid: Vendor GUID + * @verbose: if true, dump data * * Show information encoded in one UEFI variable */ -static void efi_dump_single_var(u16 *name, efi_guid_t *guid) +static void efi_dump_single_var(u16 *name, efi_guid_t *guid, bool verbose) { u32 attributes; u8 *data; @@ -68,7 +102,7 @@ static void efi_dump_single_var(u16 *name, efi_guid_t *guid) if (ret != EFI_SUCCESS) goto out; - printf("%ls:", name); + printf("%ls:\n %s:", name, efi_guid_to_str(guid)); for (count = 0, i = 0; i < ARRAY_SIZE(efi_var_attrs); i++) if (attributes & efi_var_attrs[i].mask) { if (count) @@ -79,7 +113,9 @@ static void efi_dump_single_var(u16 *name, efi_guid_t *guid) puts(efi_var_attrs[i].text); } printf(", DataSize = 0x%zx\n", size); - print_hex_dump(" ", DUMP_PREFIX_OFFSET, 16, 1, data, size, true); + if (verbose) + print_hex_dump(" ", DUMP_PREFIX_OFFSET, 16, 1, + data, size, true); out: free(data); @@ -90,11 +126,12 @@ out: * * @argc: Number of arguments (variables) * @argv: Argument (variable name) array + * @verbose: if true, dump data * Return: CMD_RET_SUCCESS on success, or CMD_RET_RET_FAILURE * * Show information encoded in named UEFI variables */ -static int efi_dump_vars(int argc, char * const argv[]) +static int efi_dump_vars(int argc, char * const argv[], bool verbose) { u16 *var_name16, *p; efi_uintn_t buf_size, size; @@ -120,7 +157,8 @@ static int efi_dump_vars(int argc, char * const argv[]) utf8_utf16_strcpy(&p, argv[0]); efi_dump_single_var(var_name16, - (efi_guid_t *)&efi_global_variable_guid); + (efi_guid_t *)&efi_global_variable_guid, + verbose); } free(var_name16); @@ -131,11 +169,12 @@ static int efi_dump_vars(int argc, char * const argv[]) /** * efi_dump_vars() - show information about all the UEFI variables * + * @verbose: if true, dump data * Return: CMD_RET_SUCCESS on success, or CMD_RET_RET_FAILURE * * Show information encoded in all the UEFI variables */ -static int efi_dump_var_all(void) +static int efi_dump_var_all(bool verbose) { u16 *var_name16, *p; efi_uintn_t buf_size, size; @@ -171,7 +210,7 @@ static int efi_dump_var_all(void) return CMD_RET_FAILURE; } - efi_dump_single_var(var_name16, &guid); + efi_dump_single_var(var_name16, &guid, verbose); } free(var_name16); @@ -189,12 +228,13 @@ static int efi_dump_var_all(void) * Return: CMD_RET_SUCCESS on success, or CMD_RET_RET_FAILURE * * This function is for "env print -e" or "printenv -e" command: - * => env print -e [var [...]] + * => env print -e [-v] [var [...]] * If one or more variable names are specified, show information * named UEFI variables, otherwise show all the UEFI variables. */ int do_env_print_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { + bool verbose; efi_status_t ret; /* Initialize EFI drivers */ @@ -205,12 +245,23 @@ int do_env_print_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return CMD_RET_FAILURE; } - if (argc > 1) + verbose = false; + for (argc--, argv++; argc > 0 && argv[0][0] == '-'; argc--, argv++) { + switch (argv[0][1]) { + case 'v': + verbose = true; + break; + default: + return CMD_RET_USAGE; + } + } + + if (argc) /* show specified UEFI variables */ - return efi_dump_vars(--argc, ++argv); + return efi_dump_vars(argc, argv, verbose); /* enumerate and show all UEFI variables */ - return efi_dump_var_all(); + return efi_dump_var_all(verbose); } /** @@ -339,18 +390,22 @@ out: * Return: CMD_RET_SUCCESS on success, or CMD_RET_RET_FAILURE * * This function is for "env set -e" or "setenv -e" command: - * => env set -e var [value ...]] + * => env set -e [-guid guid][-nv][-bs][-rt][-a][-v] + * [-i address,size] var, or + * var [value ...] * Encode values specified and set given UEFI variable. * If no value is specified, delete the variable. */ int do_env_set_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - char *var_name, *value = NULL; - efi_uintn_t size = 0; - u16 *var_name16 = NULL, *p; - size_t len; + char *var_name, *value, *ep; + ulong addr; + efi_uintn_t size; efi_guid_t guid; u32 attributes; + bool default_guid, verbose, value_on_memory; + u16 *var_name16 = NULL, *p; + size_t len; efi_status_t ret; if (argc == 1) @@ -364,32 +419,93 @@ int do_env_set_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return CMD_RET_FAILURE; } - attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | - EFI_VARIABLE_RUNTIME_ACCESS; - if (!strcmp(argv[1], "-nv")) { - attributes |= EFI_VARIABLE_NON_VOLATILE; - argc--; - argv++; - if (argc == 1) - return CMD_RET_SUCCESS; + /* + * attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | + * EFI_VARIABLE_RUNTIME_ACCESS; + */ + value = NULL; + size = 0; + attributes = 0; + guid = efi_global_variable_guid; + default_guid = true; + verbose = false; + value_on_memory = false; + for (argc--, argv++; argc > 0 && argv[0][0] == '-'; argc--, argv++) { + if (!strcmp(argv[0], "-guid")) { + if (argc == 1) + return CMD_RET_USAGE; + + argc--; + argv++; + if (uuid_str_to_bin(argv[0], guid.b, + UUID_STR_FORMAT_GUID)) + return CMD_RET_FAILURE; + default_guid = false; + } else if (!strcmp(argv[0], "-bs")) { + attributes |= EFI_VARIABLE_BOOTSERVICE_ACCESS; + } else if (!strcmp(argv[0], "-rt")) { + attributes |= EFI_VARIABLE_RUNTIME_ACCESS; + } else if (!strcmp(argv[0], "-nv")) { + attributes |= EFI_VARIABLE_NON_VOLATILE; + } else if (!strcmp(argv[0], "-a")) { + attributes |= EFI_VARIABLE_APPEND_WRITE; + } else if (!strcmp(argv[0], "-i")) { + /* data comes from memory */ + if (argc == 1) + return CMD_RET_USAGE; + + argc--; + argv++; + addr = simple_strtoul(argv[0], &ep, 16); + if (*ep != ',') + return CMD_RET_USAGE; + + size = simple_strtoul(++ep, NULL, 16); + if (!size) + return CMD_RET_FAILURE; + value_on_memory = true; + } else if (!strcmp(argv[0], "-v")) { + verbose = true; + } else { + return CMD_RET_USAGE; + } } + if (!argc) + return CMD_RET_USAGE; - var_name = argv[1]; - if (argc == 2) { - /* delete */ - value = NULL; - size = 0; - } else { /* set */ - argc -= 2; - argv += 2; + var_name = argv[0]; + if (default_guid) + guid = efi_global_variable_guid; - for ( ; argc > 0; argc--, argv++) + if (verbose) { + printf("GUID: %s\n", efi_guid_to_str(&guid)); + printf("Attributes: 0x%x\n", attributes); + } + + /* for value */ + if (value_on_memory) + value = map_sysmem(addr, 0); + else if (argc > 1) + for (argc--, argv++; argc > 0; argc--, argv++) + /* FIXME: signness of value */ if (append_value(&value, &size, argv[0]) < 0) { printf("## Failed to process an argument, %s\n", argv[0]); ret = CMD_RET_FAILURE; goto out; } + + if (size && !(attributes & (EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS))) { + printf("## Attributes must be specified\n"); + ret = CMD_RET_FAILURE; + goto out; + } + + if (size && verbose) { + printf("Value:\n"); + print_hex_dump(" ", DUMP_PREFIX_OFFSET, + 16, 1, value, size, true); } len = utf8_utf16_strnlen(var_name, strlen(var_name)); @@ -402,9 +518,9 @@ int do_env_set_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) p = var_name16; utf8_utf16_strncpy(&p, var_name, len + 1); - guid = efi_global_variable_guid; ret = EFI_CALL(efi_set_variable(var_name16, &guid, attributes, size, value)); + unmap_sysmem(value); if (ret == EFI_SUCCESS) { ret = CMD_RET_SUCCESS; } else { @@ -412,7 +528,10 @@ int do_env_set_efi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ret = CMD_RET_FAILURE; } out: - free(value); + if (value_on_memory) + unmap_sysmem(value); + else + free(value); free(var_name16); return ret; -- 2.21.0

2 1