November 2020 - U-Boot

[PATCH] x86: coral: Correct max98357 file
by Simon Glass 10 Nov '20

10 Nov '20

This somehow ended up as an empty file. Fix it. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- .../max98357-render-2ch-48khz-24b.dat | Bin 0 -> 116 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/board/google/chromebook_coral/max98357-render-2ch-48khz-24b.dat b/board/google/chromebook_coral/max98357-render-2ch-48khz-24b.dat index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b0b5b9ba648c4546f98e15e42356a5fc4af6bb27 100644 GIT binary patch literal 116 zcmZQzU|?WnWOx?=qy_%}|BnyXGahJUU??~MR0;$VT+Bccgqa+G1PJi6vnv28CMf>T R&%gk}Aix2{5<r{+!~hE!AMpSH literal 0 HcmV?d00001 -- 2.29.2.222.g5d2a92d10f8-goog

2 2

[PATCH] x86: Avoid using hardcoded number of variable range MTRRs in mtrr_commit()
by Bin Meng 10 Nov '20

10 Nov '20

Since commit 29d2d64ed55f ("x86: Add support for more than 8 MTRRs"), the maximum number of variable range MTRRs was increased from 8 to 10, which caused a #GP exception during VESA video driver probe. On the BayTrail platform there are only 8 variable range MTRRs. In mtrr_commit() it still uses MTRR_MAX_COUNT which should have been updated to use dynamically probed number. This fixes the boot failure seen on Intel Minnow Max board. Fixes: 29d2d64ed55f ("x86: Add support for more than 8 MTRRs") Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- arch/x86/cpu/mtrr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/cpu/mtrr.c b/arch/x86/cpu/mtrr.c index 5180eb0..6f095c5 100644 --- a/arch/x86/cpu/mtrr.c +++ b/arch/x86/cpu/mtrr.c @@ -158,7 +158,7 @@ int mtrr_commit(bool do_caches) /* Clear the ones that are unused */ debug("clear\n"); - for (; i < MTRR_MAX_COUNT; i++) + for (; i < mtrr_get_var_count(); i++) wrmsrl(MTRR_PHYS_MASK_MSR(i), 0); debug("close\n"); mtrr_close(&state, do_caches); -- 2.7.4

2 3

[PATCH v3] sunxi: a64: Add a defconfig for the PinePhone
by Samuel Holland 10 Nov '20

10 Nov '20

The PinePhone is a smartphone produced by Pine64, with an A64 SoC, 2 or 3 GiB LPDDR3 RAM, 16 or 32 GiB eMMC, 720x1440 MIPI-DSI panel, and Quectel EG25-G modem. There are two main board revisions: 1.1 for early adopters, and 1.2 for mass production. Since there is code to detect the board revision at boot, one config/image can support both boards. Acked-by: Maxime Ripard <mripard(a)kernel.org> Signed-off-by: Samuel Holland <samuel(a)sholland.org> --- Changes v2->v3: - All other patches merged - Added entry to MAINTAINERS Changes v1->v2: - Regenerated defconfig with `make savedefconfig` - Added Acked-by tag board/sunxi/MAINTAINERS | 5 +++++ configs/pinephone_defconfig | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 configs/pinephone_defconfig diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 1180b86db3..d3755ae41a 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -451,6 +451,11 @@ M: Icenowy Zheng <icenowy(a)aosc.io> S: Maintained F: configs/pine_h64_defconfig +PINEPHONE BOARD +M: Samuel Holland <samuel(a)sholland.org> +S: Maintained +F: configs/pinephone_defconfig + R16 EVB PARROT BOARD M: Quentin Schulz <quentin.schulz(a)free-electrons.com> S: Maintained diff --git a/configs/pinephone_defconfig b/configs/pinephone_defconfig new file mode 100644 index 0000000000..64ecef59c9 --- /dev/null +++ b/configs/pinephone_defconfig @@ -0,0 +1,12 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_SPL=y +CONFIG_MACH_SUN50I=y +CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y +CONFIG_DRAM_CLK=552 +CONFIG_DRAM_ZQ=3881949 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_PINEPHONE_DT_SELECTION=y +CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-pinephone-1.2" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_OF_LIST="sun50i-a64-pinephone-1.1 sun50i-a64-pinephone-1.2" -- 2.26.2

2 1

Fail to reset on Odroid-C4
by Jaehoon Chung 09 Nov '20

09 Nov '20

Hi, I have checked U-boot on Odroid-C4 with v2020.10. I found a problem about reset behavior. In my environment, - Boot to SD-card, - built u-boot v2020.10 with ordoid-c4_defconfig - Referred to doc/board/amlogic/odroid-c4.rst If do "reset" command after run command "mmcinfo", it didn't work anymore. - After something to do operation relevant to MMC. (read/write or ls mmc, etc..) U-Boot 2020.10-00383-g2f27fb20151b-dirty (Nov 06 2020 - 10:37:09 +0900) odroid-c4 Model: Hardkernel ODROID-C4 SoC: Amlogic Meson SM1 (Unknown) Revision 2b:c (10:2) DRAM: 3.8 GiB MMC: sd@ffe05000: 0, mmc@ffe07000: 1 In: serial Out: serial Err: serial Net: eth0: ethernet@ff3f0000 Hit any key to stop autoboot: 0 Odroid N2> Odroid N2> Odroid N2> Odroid N2> Odroid N2> Odroid N2> mmcinfo Device: sd@ffe05000 Manufacturer ID: 3 OEM: 5344 Name: SB16G Bus Speed: 50000000 Mode: SD High Speed (50MHz) Rd Block Len: 512 SD version 3.0 High Capacity: Yes Capacity: 14.8 GiB Bus Width: 4-bit Erase Group Size: 512 Bytes Odroid N2> reset resetting ... bl31 reboot reason: 0xd bl31 reboot reason: 0x0 system cmd 1. SM1:BL:511f6b:81ca2f;FEAT:A0F83180:20282000;POC:F;RCY:0;EMMC:800;NAND:81;SD?:0;SD:0;READ:0;0.0;CHK:0; bl2_stage_init 0x01 bl2_stage_init 0x81 hw id:?M1:BL:511f6b:81ca2f;FEAT:A0F83180:20282000;POC:F;RCY:0;EMMC:800;NAND:81;SD?:0;SD:800;USB:8; I didn't analyze it in more detail. I will do. But it seems that relevant to BL2 binary. If nothing to do before reset, it's working fine. If someone already fixed this or I missed something to do, let me know, plz. Best Regards, Jaehoon Chung

2 6

[PATCH] arm: actions: increase SYS_MALLOC_F_LEN
by Amit Singh Tomar 09 Nov '20

09 Nov '20

after commit 4ab3817ff16a ("clk: fixed-rate: Enable DM_FLAG_PRE_RELOC flag") Cubieboard7 (based on actions S700 SoC) fails to boot. It is due to the fact that the default value of CONFIG_SYS_MALLOC_F_LEN (0x400) would not provide enough memory for clock device to probe (before relocation) well. This commit fixes it, by increasing SYS_MALLOC_F_LEN to value 0x2000. Suggested-by: Andre Przywara <andre.przywara(a)arm.com> Signed-off-by: Amit Singh Tomar <amittomer25(a)gmail.com> --- Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Kconfig b/Kconfig index c94b10e9fa72..6dc20ed25b29 100644 --- a/Kconfig +++ b/Kconfig @@ -200,7 +200,7 @@ config SYS_MALLOC_F_LEN default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \ ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5 || \ ARCH_LS1012A || ARCH_LS1021A || ARCH_LS1043A || \ - ARCH_LS1046A || ARCH_QEMU || ARCH_SUNXI) + ARCH_LS1046A || ARCH_QEMU || ARCH_SUNXI || ARCH_OWL) default 0x400 help Before relocation, memory is very limited on many platforms. Still, -- 2.7.4

3 2

[PATCH] net: ks8851: Implement EEPROM MAC address readout
by Marek Vasut 09 Nov '20

09 Nov '20

In case there is an EEPROM attached to the KS8851 MAC and the EEPROM contains a valid MAC address, the MAC address is loaded into the NIC registers on power on. Read the MAC address out of the NIC registers and provide it to U-Boot. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Eugen Hristev <eugen.hristev(a)microchip.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> --- drivers/net/ks8851_mll.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c index d22668446d..58e065cdcc 100644 --- a/drivers/net/ks8851_mll.c +++ b/drivers/net/ks8851_mll.c @@ -622,6 +622,34 @@ static int ks8851_write_hwaddr(struct udevice *dev) return 0; } +static int ks8851_read_rom_hwaddr(struct udevice *dev) +{ + struct ks_net *ks = dev_get_priv(dev); + struct eth_pdata *pdata = dev_get_platdata(dev); + u16 addrl, addrm, addrh; + + /* No EEPROM means no valid MAC address. */ + if (!(ks_rdreg16(ks, KS_CCR) & CCR_EEPROM)) + return -EINVAL; + + /* + * If the EEPROM contains valid MAC address, it is loaded into + * the NIC on power on. Read the MAC out of the NIC registers. + */ + addrl = ks_rdreg16(ks, KS_MARL); + addrm = ks_rdreg16(ks, KS_MARM); + addrh = ks_rdreg16(ks, KS_MARH); + + pdata->enetaddr[0] = (addrh >> 8) & 0xff; + pdata->enetaddr[1] = addrh & 0xff; + pdata->enetaddr[2] = (addrm >> 8) & 0xff; + pdata->enetaddr[3] = addrm & 0xff; + pdata->enetaddr[4] = (addrl >> 8) & 0xff; + pdata->enetaddr[5] = addrl & 0xff; + + return !is_valid_ethaddr(pdata->enetaddr); +} + static int ks8851_bind(struct udevice *dev) { return device_set_name(dev, dev->name); @@ -654,6 +682,7 @@ static const struct eth_ops ks8851_ops = { .send = ks8851_send, .recv = ks8851_recv, .write_hwaddr = ks8851_write_hwaddr, + .read_rom_hwaddr = ks8851_read_rom_hwaddr, }; static const struct udevice_id ks8851_ids[] = { -- 2.28.0

2 4

Pull request for UEFI sub-system for efi-2021-01-rc2 (2)
by Heinrich Schuchardt 09 Nov '20

09 Nov '20

The following changes since commit 22ad69b7987eb4b10221330661db4427e40174fb: Merge tag 'dm-pull5nov20' of git://git.denx.de/u-boot-dm (2020-11-06 11:27:14 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2021-01-rc2-2 for you to fetch changes up to a322f54f50cfb2e8e7a68968c060b2fd3dbd934d: tpm: Change response length of tpm2_get_capability() (2020-11-09 17:28:18 +0100) ---------------------------------------------------------------- Pull request for UEFI sub-system for efi-2021-01-rc2 (2) The following bugs are fixed: * The conitrace command failed to build. * Non-volatile UEFI variables were not delete form the file store. The following features are added: * Support for the FN1 - FN10 keys on crosswire keyboards is added. * An EFI binary is provided to dump the binary device tree. tpm2_get_capability() is adjusted in preparation of the implementation of the EFI_TCG2_PROTOCOL. Gitlab CI showed no problems: https://gitlab.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/5301 ---------------------------------------------------------------- Heinrich Schuchardt (4): cmd: conitrace: replace getc() by getchar() input: add support for FN1 - FN10 on crosswire kbd efi_loader: non-volatile variable not deleted from file efi_selftest: add tool to download dtb Ilias Apalodimas (1): tpm: Change response length of tpm2_get_capability() cmd/conitrace.c | 4 +- cmd/tpm-v2.c | 4 +- drivers/input/input.c | 35 +++++-- lib/efi_loader/efi_variable.c | 1 + lib/efi_selftest/Makefile | 5 + lib/efi_selftest/dtbdump.c | 215 ++++++++++++++++++++++++++++++++++++++++++ lib/tpm-v2.c | 4 +- 7 files changed, 252 insertions(+), 16 deletions(-) create mode 100644 lib/efi_selftest/dtbdump.c

2 4

Please pull u-boot-dm
by Simon Glass 09 Nov '20

09 Nov '20

Hi Tom, The following changes since commit 35b7ca768f7d826b77d5d3d6ccd6b1b8ed21f186: arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig (2020-11-04 10:13:44 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull5nov20 for you to fetch changes up to dc4b2a9770b5b932cd6d98c33ebff6dc46de6849: patman: Support listing comments from patchwork (2020-11-05 09:11:31 -0700) ---------------------------------------------------------------- patman status subcommand to collect tags from Patchwork patman showing email replies from Patchwork sandbox poweroff command minor fixes in binman, tests ---------------------------------------------------------------- Alper Nebi Yasak (1): cros_ec: Support keyboard scanning with EC_CMD_GET_NEXT_EVENT Heinrich Schuchardt (10): sandbox: eth-raw: do not close the console input sandbox: enable poweroff command test/py: test poweroff sandbox: use O_CLOEXEC in os_open() sandbox: implement reset test: adjust sysreset tests sandbox: update function descriptions in os.h doc: add sandbox API test: test/bloblist.c depends on asm/state.h test: linking test/compression.c fails Michal Simek (2): binman: Call helper function binman_set_rom_offset() to fill offset binman: Fix typo in kernel-doc format for binman_symname() Simon Glass (31): binman: Update intel_ifwi to store padded section binman: Correct calculation for image-pos patman: Correct operation of -n azure/gitLab/travis: Add pygit2 as a dependency for tests patman: Update how tests are run patman: Fix whitespace errors in func_test patman: Use capture_sys_output() consistently patman: Fix remaining pylint3 warnings in func_test patman: Allow linking a series with patchwork patman: Fix indenting in patchstream patman: Fix constant style in patchstream patman: Rename functions in patchstream patman: Rename variables in patchstream patman: Drop unused args in patchstream patman: Fix up argument/return docs in patchstream patman: Move warning collection to a function patman: Attach warnings to individual patches patman: Convert 'Series-xxx' tag errors into warnings patman: Drop unused signoff member patman: Add a test for PatchStream tags patman: Add some tests for warnings patman: Convert testBasic() to use an interator patman: Fix spelling of plural for warning patman: Don't ignore lines starting with hash patman: Allow showing a Commit as a string patman: Improve handling of files patman: Detect missing upstream in CountCommitsToBranch patman: Support checking for review tags in patchwork patman: Support updating a branch with review tags patman: Support parsing of review snippets patman: Support listing comments from patchwork .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- .travis.yml | 1 + arch/Kconfig | 3 +- arch/sandbox/cpu/eth-raw-os.c | 8 +- arch/sandbox/cpu/os.c | 16 +- arch/sandbox/cpu/start.c | 26 ++ arch/sandbox/cpu/state.c | 1 + arch/sandbox/include/asm/u-boot-sandbox.h | 10 + doc/api/index.rst | 1 + doc/api/sandbox.rst | 9 + drivers/input/cros_ec_keyb.c | 32 +- drivers/misc/cros_ec.c | 15 + drivers/sysreset/sysreset_sandbox.c | 3 + include/binman_sym.h | 2 +- include/cros_ec.h | 11 + include/os.h | 236 ++++++----- lib/binman.c | 4 +- test/Kconfig | 9 + test/Makefile | 4 +- test/dm/sysreset.c | 11 +- test/py/tests/test_sandbox_exit.py | 8 +- tools/binman/entry.py | 18 +- tools/binman/etype/intel_ifwi.py | 2 +- tools/buildman/control.py | 6 +- tools/patman/README | 110 +++++- tools/patman/checkpatch.py | 18 +- tools/patman/commit.py | 5 + tools/patman/control.py | 71 +++- tools/patman/func_test.py | 983 ++++++++++++++++++++++++++++++++++++++++++---- tools/patman/gitutil.py | 10 +- tools/patman/main.py | 42 +- tools/patman/patchstream.py | 485 ++++++++++++++++------- tools/patman/series.py | 8 +- tools/patman/status.py | 482 +++++++++++++++++++++++ tools/patman/terminal.py | 21 +- tools/patman/test_checkpatch.py | 6 +- 37 files changed, 2293 insertions(+), 388 deletions(-) create mode 100644 doc/api/sandbox.rst create mode 100644 tools/patman/status.py Regards, Simon

2 1

[RESEND PATCH V2] dfu: add DFU_SKIP layout concept
by Jaehoon Chung 09 Nov '20

09 Nov '20

Add DFU_SKIP layout concept. If layout is "skip", it will be skipped after nothing to do. It's useful to support multiple board with one tar file. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> Reviewed-by: Minkyu Kang <mk7.kang(a)samsung.com> --- V2: Fix typo and Minkyu's reviewed-tag --- doc/README.dfu | 10 +++++++++- drivers/dfu/dfu.c | 2 +- drivers/dfu/dfu_mmc.c | 9 +++++++++ include/dfu.h | 1 + 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/doc/README.dfu b/doc/README.dfu index 4b9f88354072..827d300e251f 100644 --- a/doc/README.dfu +++ b/doc/README.dfu @@ -17,7 +17,7 @@ Overview: - The access to mediums is done in DFU backends (driver/dfu) Today the supported DFU backends are: - - MMC (RAW or FAT / EXT2 / EXT3 / EXT4 file system) + - MMC (RAW or FAT / EXT2 / EXT3 / EXT4 file system / SKIP) - NAND - RAM - SF (serial flash) @@ -91,6 +91,7 @@ Commands: <name> part <dev> <part_id> [mmcpart <num>] raw access to partition <name> fat <dev> <part_id> [mmcpart <num>] file in FAT partition <name> ext4 <dev> <part_id> [mmcpart <num>] file in EXT4 partition + <name> skip 0 0 Skip after Nothing to do with <partid> being the GPT or DOS partition index, with <num> being the eMMC hardware partition number. @@ -103,6 +104,13 @@ Commands: "u-boot raw 0x80 0x800;uImage ext4 0 2" + If don't want to flash image file to storage, use "skip" layout. + - It can be protected to flash wrong image with specific board name. + - Especailly, this layout will be useful when thor protocol is used. + For example, if make a tar file to support two board with u-boot-<board1>.bin + and u-boot-<board2>.bin, it can make to flash a proper u-boot without fail. + "u-boot-<board1>.bin raw 0x80 0x800; u-boot-<board2>.bin skip 0 0" + "nand" (raw slc nand device) cmd: dfu 0 nand <dev> each element in "dfu_alt_info" = diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index a298c2c43999..f679f1fa5fe5 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -614,7 +614,7 @@ const char *dfu_get_dev_type(enum dfu_device_type t) const char *dfu_get_layout(enum dfu_layout l) { const char *const dfu_layout[] = {NULL, "RAW_ADDR", "FAT", "EXT2", - "EXT3", "EXT4", "RAM_ADDR" }; + "EXT3", "EXT4", "RAM_ADDR", "SKIP" }; return dfu_layout[l]; } diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index 691d01c7ebdf..c7c324b0a986 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -108,6 +108,8 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, case DFU_FS_EXT4: fstype = FS_TYPE_EXT; break; + case DFU_SKIP: + return 0; default: printf("%s: Layout (%s) not (yet) supported!\n", __func__, dfu_get_layout(dfu->layout)); @@ -204,6 +206,9 @@ int dfu_write_medium_mmc(struct dfu_entity *dfu, case DFU_FS_EXT4: ret = mmc_file_buf_write(dfu, offset, buf, len); break; + case DFU_SKIP: + ret = 0; + break; default: printf("%s: Layout (%s) not (yet) supported!\n", __func__, dfu_get_layout(dfu->layout)); @@ -238,6 +243,8 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size) if (ret < 0) return ret; return 0; + case DFU_SKIP: + return 0; default: printf("%s: Layout (%s) not (yet) supported!\n", __func__, dfu_get_layout(dfu->layout)); @@ -399,6 +406,8 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, char *s) dfu->layout = DFU_FS_FAT; } else if (!strcmp(entity_type, "ext4")) { dfu->layout = DFU_FS_EXT4; + } else if (!strcmp(entity_type, "skip")) { + dfu->layout = DFU_SKIP; } else { pr_err("Memory layout (%s) not supported!\n", entity_type); return -ENODEV; diff --git a/include/dfu.h b/include/dfu.h index 84abdc79acd1..2e8276c69c9f 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -33,6 +33,7 @@ enum dfu_layout { DFU_FS_EXT3, DFU_FS_EXT4, DFU_RAM_ADDR, + DFU_SKIP, }; enum dfu_op { -- 2.29.0

1 0

[PATCH V2] dfu: add DFU_SKIP layout concept
by Jaehoon Chung 09 Nov '20

09 Nov '20

Add DFU_SKIP layout ccocept. If layout is "skip", it will be skipped after nothing to do. It's useful to support multiple board with one tar file. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> Reviewed-by: Minkyu Kang <mk7.kang(a)samsung.com> --- V2: Fix typo and Minkyu's reviewed-tag --- doc/README.dfu | 10 +++++++++- drivers/dfu/dfu.c | 2 +- drivers/dfu/dfu_mmc.c | 9 +++++++++ include/dfu.h | 1 + 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/doc/README.dfu b/doc/README.dfu index 4b9f88354072..827d300e251f 100644 --- a/doc/README.dfu +++ b/doc/README.dfu @@ -17,7 +17,7 @@ Overview: - The access to mediums is done in DFU backends (driver/dfu) Today the supported DFU backends are: - - MMC (RAW or FAT / EXT2 / EXT3 / EXT4 file system) + - MMC (RAW or FAT / EXT2 / EXT3 / EXT4 file system / SKIP) - NAND - RAM - SF (serial flash) @@ -91,6 +91,7 @@ Commands: <name> part <dev> <part_id> [mmcpart <num>] raw access to partition <name> fat <dev> <part_id> [mmcpart <num>] file in FAT partition <name> ext4 <dev> <part_id> [mmcpart <num>] file in EXT4 partition + <name> skip 0 0 Skip after Nothing to do with <partid> being the GPT or DOS partition index, with <num> being the eMMC hardware partition number. @@ -103,6 +104,13 @@ Commands: "u-boot raw 0x80 0x800;uImage ext4 0 2" + If don't want to flash image file to storage, use "skip" layout. + - It can be protected to flash wrong image with specific board name. + - Especailly, this layout will be useful when thor protocol is used. + For example, if make a tar file to support two board with u-boot-<board1>.bin + and u-boot-<board2>.bin, it can make to flash a proper u-boot without fail. + "u-boot-<board1>.bin raw 0x80 0x800; u-boot-<board2>.bin skip 0 0" + "nand" (raw slc nand device) cmd: dfu 0 nand <dev> each element in "dfu_alt_info" = diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index a298c2c43999..f679f1fa5fe5 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -614,7 +614,7 @@ const char *dfu_get_dev_type(enum dfu_device_type t) const char *dfu_get_layout(enum dfu_layout l) { const char *const dfu_layout[] = {NULL, "RAW_ADDR", "FAT", "EXT2", - "EXT3", "EXT4", "RAM_ADDR" }; + "EXT3", "EXT4", "RAM_ADDR", "SKIP" }; return dfu_layout[l]; } diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index 691d01c7ebdf..c7c324b0a986 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -108,6 +108,8 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, case DFU_FS_EXT4: fstype = FS_TYPE_EXT; break; + case DFU_SKIP: + return 0; default: printf("%s: Layout (%s) not (yet) supported!\n", __func__, dfu_get_layout(dfu->layout)); @@ -204,6 +206,9 @@ int dfu_write_medium_mmc(struct dfu_entity *dfu, case DFU_FS_EXT4: ret = mmc_file_buf_write(dfu, offset, buf, len); break; + case DFU_SKIP: + ret = 0; + break; default: printf("%s: Layout (%s) not (yet) supported!\n", __func__, dfu_get_layout(dfu->layout)); @@ -238,6 +243,8 @@ int dfu_get_medium_size_mmc(struct dfu_entity *dfu, u64 *size) if (ret < 0) return ret; return 0; + case DFU_SKIP: + return 0; default: printf("%s: Layout (%s) not (yet) supported!\n", __func__, dfu_get_layout(dfu->layout)); @@ -399,6 +406,8 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *devstr, char *s) dfu->layout = DFU_FS_FAT; } else if (!strcmp(entity_type, "ext4")) { dfu->layout = DFU_FS_EXT4; + } else if (!strcmp(entity_type, "skip")) { + dfu->layout = DFU_SKIP; } else { pr_err("Memory layout (%s) not supported!\n", entity_type); return -ENODEV; diff --git a/include/dfu.h b/include/dfu.h index 84abdc79acd1..2e8276c69c9f 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -33,6 +33,7 @@ enum dfu_layout { DFU_FS_EXT3, DFU_FS_EXT4, DFU_RAM_ADDR, + DFU_SKIP, }; enum dfu_op { -- 2.29.0

1 1