July 2022 - U-Boot

[PATCH] pmic: pca9450: permit config on all bucks and LDOs
by Heiko Thiery 22 Aug '22

22 Aug '22

In order to have the possibility to configure the regulators at system startup through DM support, all LDOs and bucks must be able to be changeable. Currently there is a limitation to change the values when the output is enabled. Since the driver is based on the ROHM BD71837 and a comment that describes a limitation about switching while the output is enabled can also be found there, the limitation probably comes from this type. Signed-off-by: Heiko Thiery <heiko.thiery(a)gmail.com> --- drivers/power/regulator/pca9450.c | 42 ++++++++++--------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/drivers/power/regulator/pca9450.c b/drivers/power/regulator/pca9450.c index 23badaa332..fe1869397c 100644 --- a/drivers/power/regulator/pca9450.c +++ b/drivers/power/regulator/pca9450.c @@ -44,7 +44,6 @@ struct pca9450_vrange { * @ranges: pointer to ranges of regulator voltages and matching register * values * @numranges: number of voltage ranges pointed by ranges - * @dvs: whether the voltage can be changed when regulator is enabled */ struct pca9450_plat { const char *name; @@ -54,7 +53,6 @@ struct pca9450_plat { u8 volt_mask; struct pca9450_vrange *ranges; unsigned int numranges; - bool dvs; }; #define PCA_RANGE(_min, _vstep, _sel_low, _sel_hi) \ @@ -63,11 +61,11 @@ struct pca9450_plat { .min_sel = (_sel_low), .max_sel = (_sel_hi), \ } -#define PCA_DATA(_name, enreg, enmask, vreg, vmask, _range, _dvs) \ +#define PCA_DATA(_name, enreg, enmask, vreg, vmask, _range) \ { \ .name = (_name), .enable_reg = (enreg), .enablemask = (enmask), \ .volt_reg = (vreg), .volt_mask = (vmask), .ranges = (_range), \ - .numranges = ARRAY_SIZE(_range), .dvs = (_dvs), \ + .numranges = ARRAY_SIZE(_range) \ } static struct pca9450_vrange pca9450_buck123_vranges[] = { @@ -107,39 +105,39 @@ static struct pca9450_plat pca9450_reg_data[] = { /* Bucks 1-3 which support dynamic voltage scaling */ PCA_DATA("BUCK1", PCA9450_BUCK1CTRL, HW_STATE_CONTROL, PCA9450_BUCK1OUT_DVS0, PCA9450_DVS_BUCK_RUN_MASK, - pca9450_buck123_vranges, true), + pca9450_buck123_vranges), PCA_DATA("BUCK2", PCA9450_BUCK2CTRL, HW_STATE_CONTROL, PCA9450_BUCK2OUT_DVS0, PCA9450_DVS_BUCK_RUN_MASK, - pca9450_buck123_vranges, true), + pca9450_buck123_vranges), PCA_DATA("BUCK3", PCA9450_BUCK3CTRL, HW_STATE_CONTROL, PCA9450_BUCK3OUT_DVS0, PCA9450_DVS_BUCK_RUN_MASK, - pca9450_buck123_vranges, true), + pca9450_buck123_vranges), /* Bucks 4-6 which do not support dynamic voltage scaling */ PCA_DATA("BUCK4", PCA9450_BUCK4CTRL, HW_STATE_CONTROL, PCA9450_BUCK4OUT, PCA9450_DVS_BUCK_RUN_MASK, - pca9450_buck456_vranges, false), + pca9450_buck456_vranges), PCA_DATA("BUCK5", PCA9450_BUCK5CTRL, HW_STATE_CONTROL, PCA9450_BUCK5OUT, PCA9450_DVS_BUCK_RUN_MASK, - pca9450_buck456_vranges, false), + pca9450_buck456_vranges), PCA_DATA("BUCK6", PCA9450_BUCK6CTRL, HW_STATE_CONTROL, PCA9450_BUCK6OUT, PCA9450_DVS_BUCK_RUN_MASK, - pca9450_buck456_vranges, false), + pca9450_buck456_vranges), /* LDOs */ PCA_DATA("LDO1", PCA9450_LDO1CTRL, HW_STATE_CONTROL, PCA9450_LDO1CTRL, PCA9450_LDO12_MASK, - pca9450_ldo1_vranges, false), + pca9450_ldo1_vranges), PCA_DATA("LDO2", PCA9450_LDO2CTRL, HW_STATE_CONTROL, PCA9450_LDO2CTRL, PCA9450_LDO12_MASK, - pca9450_ldo2_vranges, false), + pca9450_ldo2_vranges), PCA_DATA("LDO3", PCA9450_LDO3CTRL, HW_STATE_CONTROL, PCA9450_LDO3CTRL, PCA9450_LDO34_MASK, - pca9450_ldo34_vranges, false), + pca9450_ldo34_vranges), PCA_DATA("LDO4", PCA9450_LDO4CTRL, HW_STATE_CONTROL, PCA9450_LDO4CTRL, PCA9450_LDO34_MASK, - pca9450_ldo34_vranges, false), + pca9450_ldo34_vranges), PCA_DATA("LDO5", PCA9450_LDO5CTRL_H, HW_STATE_CONTROL, PCA9450_LDO5CTRL_H, PCA9450_LDO5_MASK, - pca9450_ldo5_vranges, false), + pca9450_ldo5_vranges), }; static int vrange_find_value(struct pca9450_vrange *r, unsigned int sel, @@ -246,20 +244,6 @@ static int pca9450_set_value(struct udevice *dev, int uvolt) unsigned int sel; int i, found = 0; - /* - * An under/overshooting may occur if voltage is changed for other - * regulators but buck 1,2,3 or 4 when regulator is enabled. Prevent - * change to protect the HW - */ - if (!plat->dvs) - if (pca9450_get_enable(dev)) { - /* If the value is already set, skip the warning. */ - if (pca9450_get_value(dev) == uvolt) - return 0; - pr_err("Only DVS bucks can be changed when enabled\n"); - return -EINVAL; - } - for (i = 0; i < plat->numranges; i++) { struct pca9450_vrange *r = &plat->ranges[i]; -- 2.30.2

4 3

[PATCH 0/5] Another smaller update to the nand stack
by Michael Trimarchi 22 Aug '22

22 Aug '22

Update the stack to move it slowly to linux with some improvements. We want to support more samsung variant and clean up a bit the code. This will be the last upstream changes for now until a quick review of spl code will be done to reduce duplication. I decided to move the imx8mn_bsh_smm_s2 board to use the full nand detect because onfi can easily fail on no-onfi, no-jedec nand. I take care to move the mt7621 to use nand_detect and ask gently to test it again Series successfully tested on imx8mn bsh smm s2 with NAND: - Macronix MX30LF4G18AC 512 MiB, SLC, erase size: 128 KiB, page size: 2048, OOB size: 64 Michael Trimarchi (5): mtd: nand: Rename the nand_manufacturers struct mtd: nand: change return type of nand_get_flash_type() to int mtd: nand: Rename nand_get_flash_type() into nand_detect() mtd: nand: samsung: Retrieve ECC requirements from extended configs: imx8mn_bsh_smm_s2: Use nand_base ident for nand identification configs/imx8mn_bsh_smm_s2_defconfig | 2 ++ drivers/mtd/nand/raw/mt7621_nand.c | 9 ++++--- drivers/mtd/nand/raw/mxs_nand_spl.c | 8 +++---- drivers/mtd/nand/raw/nand_base.c | 37 +++++++++++++---------------- drivers/mtd/nand/raw/nand_ids.c | 2 +- drivers/mtd/nand/raw/nand_samsung.c | 20 ++++++++++++++++ include/linux/mtd/rawnand.h | 13 +++++----- 7 files changed, 54 insertions(+), 37 deletions(-) -- 2.34.1

2 6

[PATCH 0/5] arm: mvebu: turris_omnia: Fix hangup in debug UART
by Pali Rohár 19 Aug '22

19 Aug '22

If proper U-Boot on Turris Omnia tries to print something on debug UART then CPU hangs. Reason is that debug UART in proper U-Boot for Turris Omnia has incorrect configuration of base register. Base register is different in SPL and also in different stages of proper U-Boot. Fix all these issues. Introduce new arch_very_early_init() ARM function which will be called at very early stage prior initialization of debug UART. Move code which moves internal mvebu registers to this function. And split configuration of DEBUG_UART_BASE into SPL and proper U-Boot to allow setting different values which matches current HW status. With all these changes, it is possible call "printf" function in Turris Omnia's board_early_init_f() function in both SPL and proper U-Boot. Pali Rohár (5): arm: Add new config option ARCH_VERY_EARLY_INIT arm: mvebu: Move internal registers in arch_very_early_init() function serial: Add new config option SPL_DEBUG_UART_BASE serial: ns16550: Add support for SPL_DEBUG_UART_BASE arm: mvebu: turris_omnia: Fix DEBUG_UART_BASE arch/arm/Kconfig | 6 ++++++ arch/arm/lib/crt0.S | 5 +++++ arch/arm/mach-mvebu/Kconfig | 1 + arch/arm/mach-mvebu/Makefile | 1 + arch/arm/mach-mvebu/cpu.c | 31 ------------------------------- arch/arm/mach-mvebu/lowlevel.S | 27 +++++++++++++++++++++++++++ configs/turris_omnia_defconfig | 3 ++- drivers/serial/Kconfig | 7 +++++++ drivers/serial/ns16550.c | 4 ++-- 9 files changed, 51 insertions(+), 34 deletions(-) create mode 100644 arch/arm/mach-mvebu/lowlevel.S -- 2.20.1

2 31

[PATCH v2] cmd: cat: add new command
by Roger Knecht 18 Aug '22

18 Aug '22

Add cat command to print file content to standard out Signed-off-by: Roger Knecht <rknecht(a)pm.me> --- v2: - Moved cat from boot to shell commands - Added MAINTAINERS entry - Added comments - Improved variable naming MAINTAINERS | 5 +++++ cmd/Kconfig | 6 ++++++ cmd/Makefile | 1 + cmd/cat.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 cmd/cat.c diff --git a/MAINTAINERS b/MAINTAINERS index 56be0bfad0..7c5cd178d9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -729,6 +729,11 @@ M: Simon Glass <sjg(a)chromium.org> S: Maintained F: tools/buildman/ +CAT +M: Roger Knecht <rknecht(a)pm.me> +S: Maintained +F: cmd/cat.c + CFI FLASH M: Stefan Roese <sr(a)denx.de> S: Maintained diff --git a/cmd/Kconfig b/cmd/Kconfig index 69c1814d24..8b531c7ebe 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1492,6 +1492,12 @@ endmenu menu "Shell scripting commands" +config CMD_CAT + bool "cat" + default y + help + Print file to standard output + config CMD_ECHO bool "echo" default y diff --git a/cmd/Makefile b/cmd/Makefile index 5e43a1e022..589b9680ba 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_CMD_BOOTZ) += bootz.o obj-$(CONFIG_CMD_BOOTI) += booti.o obj-$(CONFIG_CMD_BTRFS) += btrfs.o obj-$(CONFIG_CMD_BUTTON) += button.o +obj-$(CONFIG_CMD_CAT) += cat.o obj-$(CONFIG_CMD_CACHE) += cache.o obj-$(CONFIG_CMD_CBFS) += cbfs.o obj-$(CONFIG_CMD_CLK) += clk.o diff --git a/cmd/cat.c b/cmd/cat.c new file mode 100644 index 0000000000..a027d842ef --- /dev/null +++ b/cmd/cat.c @@ -0,0 +1,58 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2022 + * Roger Knecht <rknecht(a)pm.de> + */ + +#include <common.h> +#include <command.h> +#include <fs.h> +#include <malloc.h> + +static int do_cat(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) +{ + char *file_data; + loff_t file_index; + loff_t file_size; + int ret; + + if (argc < 4) + return CMD_RET_USAGE; + + ret = fs_set_blk_dev(argv[1], argv[2], FS_TYPE_ANY); + if (ret) + return ret; + + // get file size + ret = fs_size(argv[3], &file_size); + if (ret) + return ret; + + // allocate memory for file content + file_data = malloc(file_size); + if (!file_data) + return -ENOMEM; + + ret = fs_set_blk_dev(argv[1], argv[2], FS_TYPE_ANY); + if (ret) + return ret; + + // read file to memory + ret = fs_read(argv[3], (ulong)file_data, 0, 0, &file_size); + if (ret) + return ret; + + // print file content + for (file_index = 0; file_index < file_size; file_index++) + putc(file_data[file_index]); + + free(file_data); + + return 0; +} + +U_BOOT_CMD(cat, 4, 1, do_cat, + "print file to standard output", + "<interface> <dev[:part]> <file>\n" + " - Print file from 'dev' on 'interface' to standard output"); -- 2.17.1

3 5

[PATCH v10 00/10] enable menu-driven UEFI variable maintenance
by Masahisa Kojima 17 Aug '22

17 Aug '22

This series adds the menu-driven UEFI boot variable maintenance through the "eficonfig" new command. This series also adds the removable media support in bootmenu. Initrd file selection and python based unit test are added in v10. Source code can be cloned with: $ git clone https://git.linaro.org/people/masahisa.kojima/u-boot.git -b eficonfig_upstream_v10 [Major Changes] - rebased v2022.07 - add initrd file selection - add python based unit test - there is detailed changelog in each commit Masahisa Kojima (10): efi_loader: move udevice pointer into struct efi_object eficonfig: menu-driven addition of UEFI boot option eficonfig: add "Edit Boot Option" menu entry menu: add KEY_PLUS and KEY_MINUS handling eficonfig: add "Change Boot Order" menu entry eficonfig: add "Delete Boot Option" menu entry bootmenu: add removable media entries doc:bootmenu: add description for UEFI boot support doc:eficonfig: add documentation for eficonfig command test: unit test for eficonfig cmd/Kconfig | 7 + cmd/Makefile | 1 + cmd/bootmenu.c | 106 +- cmd/eficonfig.c | 2103 +++++++++++++++++ common/menu.c | 6 + configs/sandbox_defconfig | 1 + doc/usage/cmd/bootmenu.rst | 74 + doc/usage/cmd/eficonfig.rst | 63 + doc/usage/index.rst | 1 + include/efi_config.h | 91 + include/efi_loader.h | 67 + include/menu.h | 2 + lib/efi_driver/efi_block_device.c | 3 +- lib/efi_loader/efi_bootmgr.c | 7 + lib/efi_loader/efi_boottime.c | 52 +- lib/efi_loader/efi_console.c | 70 + lib/efi_loader/efi_disk.c | 65 +- lib/efi_loader/efi_file.c | 75 +- lib/efi_loader/efi_helper.c | 13 + test/py/tests/test_eficonfig/conftest.py | 40 + .../py/tests/test_eficonfig/test_eficonfig.py | 325 +++ 21 files changed, 3109 insertions(+), 63 deletions(-) create mode 100644 cmd/eficonfig.c create mode 100644 doc/usage/cmd/eficonfig.rst create mode 100644 include/efi_config.h create mode 100644 test/py/tests/test_eficonfig/conftest.py create mode 100644 test/py/tests/test_eficonfig/test_eficonfig.py -- 2.17.1

4 19

[PATCH V4 1/2] mtd: allow getting MTD device associated with a specific DT node
by Rafał Miłecki 17 Aug '22

17 Aug '22

From: Rafał Miłecki <rafal(a)milecki.pl> MTD subsystem API allows interacting with MTD devices (e.g. reading, writing, handling bad blocks). So far a random driver could get MTD device only by its name (get_mtd_device_nm()). This change allows getting them also by a DT node. This API is required for drivers handling DT defined MTD partitions in a specific way (e.g. U-Boot (sub)partition with environment variables). Signed-off-by: Rafał Miłecki <rafal(a)milecki.pl> Acked-by: Miquel Raynal <miquel.raynal(a)bootlin.com> --- V3: First introduction of of_get_mtd_device_by_node() V4: Use EPROBE_DEFER Srinivas: in V3 Miquel said it's OK to push this patch through NVMEM --- drivers/mtd/mtdcore.c | 28 ++++++++++++++++++++++++++++ include/linux/mtd/mtd.h | 1 + 2 files changed, 29 insertions(+) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 9eb0680db312..3613cc142f25 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -1154,6 +1154,34 @@ int __get_mtd_device(struct mtd_info *mtd) } EXPORT_SYMBOL_GPL(__get_mtd_device); +/** + * of_get_mtd_device_by_node - obtain an MTD device associated with a given node + * + * @np: device tree node + */ +struct mtd_info *of_get_mtd_device_by_node(struct device_node *np) +{ + struct mtd_info *mtd = NULL; + struct mtd_info *tmp; + int err; + + mutex_lock(&mtd_table_mutex); + + err = -EPROBE_DEFER; + mtd_for_each_device(tmp) { + if (mtd_get_of_node(tmp) == np) { + mtd = tmp; + err = __get_mtd_device(mtd); + break; + } + } + + mutex_unlock(&mtd_table_mutex); + + return err ? ERR_PTR(err) : mtd; +} +EXPORT_SYMBOL_GPL(of_get_mtd_device_by_node); + /** * get_mtd_device_nm - obtain a validated handle for an MTD device by * device name diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 955aee14b0f7..6fc841ceef31 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -677,6 +677,7 @@ extern int mtd_device_unregister(struct mtd_info *master); extern struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num); extern int __get_mtd_device(struct mtd_info *mtd); extern void __put_mtd_device(struct mtd_info *mtd); +extern struct mtd_info *of_get_mtd_device_by_node(struct device_node *np); extern struct mtd_info *get_mtd_device_nm(const char *name); extern void put_mtd_device(struct mtd_info *mtd); -- 2.34.1

3 3

[PATCH 0/3] sam9x60_curiosity PDA detection support
by Durai Manickam KR 17 Aug '22

17 Aug '22

This patch series adds the PDA detection support for sam9x60_curiosity rev4 boards. In rev4, the raspberry-pi display is replaced by PDA display. Durai Manickam KR (3): configs: sama9x60_curiosity: add onewire and eeprom drivers board: sam9x60_curiosity: add pda detect call at init time ARM: dts: at91: sam9x60_curiosity: add onewire support arch/arm/dts/at91-sam9x60_curiosity.dts | 17 +++++++++++++++++ .../atmel/sam9x60_curiosity/sam9x60_curiosity.c | 4 ++++ configs/sam9x60_curiosity_mmc_defconfig | 4 ++++ 3 files changed, 25 insertions(+) -- 2.25.1

2 4

[PATCH] mmc: atmel_sdhci: re-enable sdhci after SD Card re-insertion
by Sergiu Moga 17 Aug '22

17 Aug '22

Whenever the SD Card would be removed and then re-inserted while in the U-Boot command line, the `SDBPWR` bit of the `SDMMC_PCR` register would remain unset afterwards. In order for the bit to be set again after re-insertion, register an additional `deferred_probe` method that the DM would then transparently call. This method will call the generic `sdhci_probe` which will, during its execution flow, set this bit to 1. Signed-off-by: Sergiu Moga <sergiu.moga(a)microchip.com> Reported-by: Mihai Sain <mihai.sain(a)microchip.com> Reviewed-by: Eugen Hristev <eugen.hristev(a)microchip.com> --- drivers/mmc/atmel_sdhci.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c index 2b5ceeab94..37b0beeed4 100644 --- a/drivers/mmc/atmel_sdhci.c +++ b/drivers/mmc/atmel_sdhci.c @@ -52,6 +52,17 @@ struct atmel_sdhci_plat { struct mmc mmc; }; +static int atmel_sdhci_deferred_probe(struct sdhci_host *host) +{ + struct udevice *dev = host->mmc->dev; + + return sdhci_probe(dev); +} + +static const struct sdhci_ops atmel_sdhci_ops = { + .deferred_probe = atmel_sdhci_deferred_probe, +}; + static int atmel_sdhci_probe(struct udevice *dev) { struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); @@ -104,6 +115,7 @@ static int atmel_sdhci_probe(struct udevice *dev) return ret; host->mmc->priv = host; + host->ops = &atmel_sdhci_ops; upriv->mmc = host->mmc; clk_free(&clk); -- 2.25.1

2 2

[PATCH 0/5] arm: mvebu: Automatically detect CONFIG_SYS_TCLK
by Pali Rohár 16 Aug '22

16 Aug '22

This patch series automatically detects CONFIG_SYS_TCLK value, set it in global mach/soc.h file and remove manual CONFIG_SYS_TCLK value from all mvebu/kirkwood board config files. So it just a cleanup to avoid defining custom macros in board config files which can be automatically detected. Could you test these patches on a38x and a37x platforms that nothing is broken? I tested them on a38x Turris Omnia. Pali Rohár (5): arm: mvebu: a38x: Detect CONFIG_SYS_TCLK from SAR register arm: mvebu: a37x: Detect CONFIG_SYS_TCLK from SAR register arm: mvebu: msys: Set CONFIG_SYS_TCLK globally arm: mvebu: axp: Set CONFIG_SYS_TCLK globally arm: kirkwood: Do not overwrite CONFIG_SYS_TCLK arch/arm/mach-kirkwood/include/mach/kw88f6281.h | 2 -- arch/arm/mach-mvebu/include/mach/soc.h | 15 ++++++++++----- include/configs/clearfog.h | 1 - include/configs/controlcenterdc.h | 2 -- include/configs/crs3xx-98dx3236.h | 1 - include/configs/db-88f6720.h | 1 - include/configs/db-88f6820-amc.h | 2 -- include/configs/db-88f6820-gp.h | 2 -- include/configs/db-mv784mp-gp.h | 1 - include/configs/db-xc3-24g4xg.h | 1 - include/configs/ds414.h | 1 - include/configs/helios4.h | 1 - include/configs/lacie_kw.h | 5 ----- include/configs/lsxl.h | 2 -- include/configs/maxbcm.h | 1 - include/configs/theadorable.h | 1 - include/configs/turris_omnia.h | 1 - include/configs/x530.h | 2 -- 18 files changed, 10 insertions(+), 32 deletions(-) -- 2.20.1

4 19

[PATCH v2 00/11] Add Rockchip IDB device
by Johan Jonker 15 Aug '22

15 Aug '22

Add Rockchip IDB device for U-boot. On Rockchip SoCs with a NAND as boot device the information data base (IDB) loaded by the boot ROM is stored at the beginning of several erase blocks. Rewriting NAND blocks makes them wear out, so some spare blocks and a writing strategy are required. A closed source usbplug uses block: 2,3,4,5,6 for example. Block 0 and 1 is in use for other data. For compatible reasons this device follows this approach in line with other Rockchip products and modules for now. The Rockchip boot ROM requires a particular file format for booting from NAND: It starts with 512-byte (IDB sector 0), RC4 encoded header and is aligned to NAND page size. Rockchip fills sector 1,2 and 3 here with more data structures, but that is not required by the boot ROM. It just makes it easier to identify the IDB date and version. Then 2KB pieces (4 x 512 byte sectors) of spl and tpl data aligned to the NAND page size in a fixed pattern with empty pages. Size of spl and tpl must be aligned to 2KB. Empty NAND pages/sectors not in use should fill with 0xFF padding to increase NAND durability. Create a IDB image for the flash tools below with: #### For RK30 with NAND only #### printf "RK30" > tplspl.bin dd if=u-boot-tpl.bin >> tplspl.bin truncate -s %2048 tplspl.bin truncate -s %2048 u-boot-spl.bin ./mkimage -v -n rk3066 -T rksd -d ./tplspl.bin:./u-boot-spl.bin out #### For other Rockchip SoCs with NAND #### ./mkimage -v -n rk3188 -T rksd -d ./u-boot-tpl.bin:./u-boot-spl.bin out or if more data structures for IDB sector 1, 2 (RC4) and 3 (RC4) are needed then use a custom image tool as mainline only has basic support for IDB sector 0. In order to transfer data from a host (PC) via USB existing methods are used. This driver creates an GPT EFI block driver to work with the U-boot commands "rockusb" and "ums". IDB data is inserted 'on the fly' as if it were a normal disk in blocks with 512 byte. Changing disk parameters is not allowed. The IDB device driver looks for block driver sector 64 to start with and calculates the IDB size. When the last sector is received it erases a NAND block and writes IDB sectors to NAND in a pattern. Written data is verified. If not identical that NAND erase block is freed. As last thing the remaining IDB blocks are scanned and made available for reading. Normal U-boot operation contains 2 steps: 1 - start IDB device 2 - start USB gadget (rockusb or ums) U-boot IDB commands: idb start - start IDB device idb stop - stop IDB blk device idb info - show IDB device info Host (PC) tool commands combinations that work: U-boot linux rockusb 0 idb 0 upgrade_tool pl upgrade_tool wl 64 upgrade_tool_wl_64.bin upgrade_tool rl 64 512 upgrade_tool_rl_64_512.bin upgrade_tool rd rkdeveloptool ppt rkdeveloptool wlx loader1 rkdeveloptool_wlx_loader1.bin rkdeveloptool wl 64 rkdeveloptool_wl_64.bin rkdeveloptool rl 64 512 rkdeveloptool_rl_64_512.bin rkdeveloptool rd rkflashtool w 64 512 < rkflashtool_w_64_512.bin rkflashtool r 64 512 > rkflashtool_r_64_512.bin ums 0 idb 0 dd if=ums_0_idb_0_wr.bin of=/dev/sda1 dd if=/dev/sda1 of=ums_0_idb_0_rd.bin Tested with: MK808 rk3066 Not tested: nfc type V8, V9 TODO: This is placed in the mach-rockchip directory, so we can re-use/combine the source with a usbplug or RK NAND FTL driver with no MTD frame work bloatware ;) in a Makefile. IDB header V2 Writing strategy improvement etc, etc Changed V2: remove CamelCases split patch block driver split patch optinal stop and info cmd split patch optinal sector1 info split patch optinal randomizer Johan Jonker (11): rockchip: idb: prepare IDB block device rockchip: idb: add basic functions rockchip: idb: add IDB block device rockchip: idb: add info and stop command rockchip: idb: add sector1 info rockchip: idb: add randomizer option rockchip: spl: allow more boot devices rockchip: rk3066: add Rockchip IDB block device as boot action arm: dts: rockchip: sync rk3066/rk3188 DT files from Linux arm: dts: rockchip: enable nfc node in spl for rk3066 mk808 rockchip: configs: mk808: add idb configs arch/arm/dts/rk3066a-mk808-u-boot.dtsi | 8 + arch/arm/dts/rk3066a-mk808.dts | 18 + arch/arm/dts/rk3066a.dtsi | 3 +- arch/arm/dts/rk3188-radxarock.dts | 3 +- arch/arm/dts/rk3188.dtsi | 24 +- arch/arm/dts/rk3xxx-u-boot.dtsi | 4 + arch/arm/mach-rockchip/Kconfig | 12 + arch/arm/mach-rockchip/Makefile | 1 + arch/arm/mach-rockchip/rk3066/rk3066.c | 11 + arch/arm/mach-rockchip/rockchip_idb.c | 1694 ++++++++++++++++++++++++ arch/arm/mach-rockchip/spl.c | 5 +- configs/mk808_defconfig | 4 + drivers/block/blk-uclass.c | 2 + include/blk.h | 1 + include/dm/uclass-id.h | 1 + include/efi_loader.h | 4 + lib/efi_loader/efi_device_path.c | 30 + 17 files changed, 1812 insertions(+), 13 deletions(-) create mode 100644 arch/arm/mach-rockchip/rockchip_idb.c -- 2.20.1

2 1