September 2019 - U-Boot

[U-Boot] [PATCH v2] fw_setenv: avoid writing environment when nothing has changed
by Rasmus Villemoes 20 Nov '19

20 Nov '19

In the case where one deletes an already-non-existing variable, or sets a variable to the value it already has, there is no point in writing the environment back, thus reducing wear on the underlying storage device. In the case of redundant environments, if the two environments differ (e.g. because one is corrupt), make sure that any call of fw_setenv causes the two to become synchronized, even if the fw_setenv call does not change anything in the good copy. Signed-off-by: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> --- Add logic to ensure a corrupt copy gets replaced, even if fw_setenv wouldn't change anything in the good copy. tools/env/fw_env.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index a5d75958e1..66372dad55 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -110,6 +110,7 @@ struct environment { unsigned char *flags; char *data; enum flag_scheme flag_scheme; + int dirty; }; static struct environment environment = { @@ -508,6 +509,9 @@ int fw_env_flush(struct env_opts *opts) if (!opts) opts = &default_opts; + if (!environment.dirty) + return 0; + /* * Update CRC */ @@ -553,7 +557,8 @@ int fw_env_write(char *name, char *value) deleting = (oldval && !(value && strlen(value))); creating = (!oldval && (value && strlen(value))); - overwriting = (oldval && (value && strlen(value))); + overwriting = (oldval && (value && strlen(value) && + strcmp(oldval, value))); /* check for permission */ if (deleting) { @@ -593,6 +598,7 @@ int fw_env_write(char *name, char *value) /* Nothing to do */ return 0; + environment.dirty = 1; if (deleting || overwriting) { if (*++nxt == '\0') { *env = '\0'; @@ -1441,6 +1447,7 @@ int fw_env_open(struct env_opts *opts) "Warning: Bad CRC, using default environment\n"); memcpy(environment.data, default_environment, sizeof(default_environment)); + environment.dirty = 1; } } else { flag0 = *environment.flags; @@ -1494,6 +1501,16 @@ int fw_env_open(struct env_opts *opts) crc1_ok = (crc1 == redundant->crc); flag1 = redundant->flags; + /* + * environment.data still points to ((struct + * env_image_redundant *)addr0)->data. If the two + * environments differ, or one has bad crc, force a + * write-out by marking the environment dirty. + */ + if (memcmp(environment.data, redundant->data, ENV_SIZE) || + !crc0_ok || !crc1_ok) + environment.dirty = 1; + if (crc0_ok && !crc1_ok) { dev_current = 0; } else if (!crc0_ok && crc1_ok) { @@ -1503,6 +1520,7 @@ int fw_env_open(struct env_opts *opts) "Warning: Bad CRC, using default environment\n"); memcpy(environment.data, default_environment, sizeof(default_environment)); + environment.dirty = 1; dev_current = 0; } else { switch (environment.flag_scheme) { -- 2.16.4

2 2

[U-Boot] [PATCH] Makefile: fix processing of default environment file
by Samuel Mescoff 19 Nov '19

19 Nov '19

Allow the default environment file to contain long lines split into multiples lines. Leading white spaces can be added for readability as well. Signed-off-by: Samuel Mescoff <samuel(a)mescoff.fr> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2824a6e159..d11ee021ca 100644 --- a/Makefile +++ b/Makefile @@ -1660,7 +1660,7 @@ define filechk_defaultenv.h (grep -v '^#' | \ grep -v '^$$' | \ tr '\n' '\0' | \ - sed -e 's/\\\x0/\n/' | \ + sed -e 's/\\\x0\s*//g' | \ xxd -i ; echo ", 0x00" ; ) endef -- 2.20.1

2 1

[U-Boot] [PATCH v2 0/6] Raspberry Pi4: add support for DFU over USB
by Marek Szyprowski 19 Nov '19

19 Nov '19

Hi All! This patchset enables support for DFU over USB protocol on Raspberry Pi4 board. The board has DWC2 UDC controller connected to the USB-C power connector. Enabling DFU on it, make the u-boot development much more convenient, as one no longer needs to swap SD-card between RPi4 board and host machine to update the u-boot binary. Patches are based on current 'master' u-boot branch. They were tested on the 2019-07-10-raspbian-buster-lite.img sd-card image with the following lines added to config.txt: dtoverlay=dwc2,dr_mode=peripheral dtparam=i2c_arm=on dtparam=spi=on enable_uart=1 uart_2ndstage=1 kernel=u-boot.bin To enable DFU, one has to enter follwing command: # dfu 0 mmc 0 During the development of this feature I've encountered a serious bugs in FAT write code. Over-writing discontiguous files always caused serious filesystem corruption. This was especially anoying, because the system environment is kept on FAT volume in uboot.env file, so 'saveenv' basically corrupted the boot partiting on the second call. Another bunch of the issues in the FAT write code has been revealed while removing predefined file size limit in DFU MMC code. I hope that my fixes for FAT code will be helpful for non-RPi users too. Best regards Marek Szyprowski Samsung R&D Institute Poland Changelog: v2: - added changes to rpi_4_defconfig too (arm64 version) - extended DFU entity list by confix.txt, cmdline.txt and Image.gz - fixed missing '\0' at the end of dfu_alt_info env - added reviewed-by tags - added patches for DFU MMC to remove file size limit - added patch for fat write to fix issues on non-zero file offset (revealed by previous patch) v1: https://patchwork.ozlabs.org/cover/1162770/ - initial version Patch summary: Marek Szyprowski (6): fat: write: fix broken write to fragmented files fat: write: fix broken write at non-zero file offset dfu: mmc: rearrange the code dfu: mmc: remove file size limit for io operations usb: dwc2_udc_otg: add bcm2835 SoC (Raspberry Pi4) support config: enable DFU over USB on Raspberry Pi4 boards configs/rpi_4_32b_defconfig | 11 +++ configs/rpi_4_defconfig | 11 +++ drivers/dfu/dfu_mmc.c | 93 +++++++++++++--------- drivers/usb/gadget/dwc2_udc_otg.c | 2 + drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 12 +-- fs/fat/fat_write.c | 18 ++--- include/configs/rpi.h | 17 ++++ 7 files changed, 113 insertions(+), 51 deletions(-) -- 2.17.1

4 15

[U-Boot] rockchip: rk3399: TPL: rockpro64: Wrong memory size detected
by Kurt Miller 18 Nov '19

18 Nov '19

The board has 4G memory but only 2G is detected by TPL. Please let me know if additional information is needed. With u-boot master TPL output: U-Boot TPL 2019.10-rc3-00020-ge4b8dd9b34-dirty (Aug 28 2019 - 17:26:44) LPDDR4, 50MHz BW=32 Col=10 Bk=8 CS0 Row=15 CS=1 Die BW=16 Size=1024MB LPDDR4, 50MHz BW=32 Col=10 Bk=8 CS0 Row=15 CS=1 Die BW=16 Size=1024MB 256B stride Trying to boot from BOOTROM Returning to boot ROM... With rkbin rk3399_ddr_800MHz_v1.23.bin output: DDR Version 1.23 20190709 In channel 0 CS = 0 MR0=0xB8 MR4=0x2 MR5=0xFF MR8=0x10 MR12=0x72 MR14=0x72 MR18=0x0 MR19=0x0 MR24=0x8 MR25=0x0 channel 1 CS = 0 MR0=0xB8 MR4=0x2 MR5=0xFF MR8=0x10 MR12=0x72 MR14=0x72 MR18=0x0 MR19=0x0 MR24=0x8 MR25=0x0 channel 0 training pass! channel 1 training pass! change freq to 416MHz 0,1 Channel 0: LPDDR4,416MHz Bus Width=32 Col=10 Bank=8 Row=16 CS=1 Die Bus-Width=16 Size=2048MB Channel 1: LPDDR4,416MHz Bus Width=32 Col=10 Bank=8 Row=16 CS=1 Die Bus-Width=16 Size=2048MB 256B stride channel 0 CS = 0 MR0=0xB8 MR4=0x2 MR5=0xFF MR8=0x10 MR12=0x72 MR14=0x72 MR18=0x0 MR19=0x0 MR24=0x8 MR25=0x0 channel 1 CS = 0 MR0=0xB8 MR4=0x2 MR5=0xFF MR8=0x10 MR12=0x72 MR14=0x72 MR18=0x0 MR19=0x0 MR24=0x8 MR25=0x0 channel 0 training pass! channel 1 training pass! channel 0, cs 0, advanced training done channel 1, cs 0, advanced training done change freq to 856MHz 1,0 ch 0 ddrconfig = 0x101, ddrsize = 0x40 ch 1 ddrconfig = 0x101, ddrsize = 0x40 pmugrf_os_reg[2] = 0x32C1F2C1, stride = 0xD OUT

4 12

[U-Boot] [PATCH] board: rpi4: fix instantiating PL011 driver
by Mark Dapoz 18 Nov '19

18 Nov '19

The bcm283x PL011 serial driver is hard coded to allow connections only for UART0. This prevents using any of the other UARTs as the U-boot console. The bcm283x serial driver is updated to allow connections to any of the PL011 devices. The initialization logic has been updated as follows: - a GPIO pinlist is extracted from the device tree for the device - each pin is compared against a function assignment table - if the pin is found in the table and the currently assigned GPIO function doesn't match, the device is unavailable - if the function matches the table entry or the pin is not listed the table, the device is available The function assignment table contains entries for UART0 to ensure it is multiplexed to GPIO pins 14 and 15. This logic allows GPIO 14 and 15 to be multiplexed between the miniUART and the PL011 UART by the board's loader. An error in the default clock rate has also been fixed. If the device tree entry for the serial device doesn't specify a "clocks" property, the default frequency of 1Hz was used. The default has been changed to 48MHz. The configuration for the Raspberry Pi 4 has been updated to include the PL011 driver. To select an alternate UART as the U-boot console, the stdout-path can be used as follows: chosen { stdout-path = "/soc/serial@7e201a00:115200"; } Signed-off-by: Mark Dapoz <Mark.Dapoz(a)windriver.com> --- configs/rpi_4_32b_defconfig | 1 + configs/rpi_4_defconfig | 1 + drivers/serial/serial_bcm283x_pl011.c | 150 ++++++++++++++++++++++++++++++---- 3 files changed, 136 insertions(+), 16 deletions(-) diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig index dc69690..cd66b0b 100644 --- a/configs/rpi_4_32b_defconfig +++ b/configs/rpi_4_32b_defconfig @@ -31,3 +31,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_BCM283X_PL011_SERIAL=y diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig index 2d63197..9f862c4 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig @@ -31,3 +31,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_PHYS_TO_BUS=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_BCM283X_PL011_SERIAL=y diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index 2527bb8..75b7ed5 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -11,24 +11,142 @@ #include <serial.h> #include "serial_pl01x_internal.h" +#define UART0_GPIO_RX 15 +#define UART0_GPIO_TX 14 + +/* required pin vs function list for the PL011 UARTs */ + +static const struct pin_func_map { + int pin; /* GPIO pin number */ + int function; /* GPIO function */ +} uart_pin_functions[] = { + { .pin = UART0_GPIO_TX, .function = BCM2835_GPIO_ALT0 }, /* TXD0 */ + { .pin = UART0_GPIO_RX, .function = BCM2835_GPIO_ALT0 }, /* RXD0 */ +}; + +static const int num_uart_pin_functions = + sizeof(uart_pin_functions) / sizeof(struct pin_func_map); + +/* + * Check if the pin/function assignment is valid + * + * The pin/function assignment is validated against the PL011 function + * table to determine if the current configuration is valid for a + * PL011 UART. + * + * @return true if the assignment is valid, false if not + */ +static bool bcm383x_check_gpio_mapping(int pin, int function) +{ + int i; + + /* iterate through the list checking the pin assignment */ + + for (i = 0; i < num_uart_pin_functions; i++) { + if (uart_pin_functions[i].pin == pin) { + /* pin assignment matches, check for a valid function */ + + if (uart_pin_functions[i].function == function) + return true; + else + return false; + } + } + + /* no pin match found, the mapping is unrestricted */ + + return true; +} + /* - * Check if this serial device is muxed + * Check if this serial device is available and muxed correctly * - * The serial device will only work properly if it has been muxed to the serial - * pins by firmware. Check whether that happened here. + * The uart0 serial device will only work properly if it has been muxed to + * the serial pins by firmware. Check if the device is uart0 and if it is + * is the muxing correct. * - * @return true if serial device is muxed, false if not + * @return true if serial device is usable, false if not */ -static bool bcm283x_is_serial_muxed(void) +static bool bcm383x_check_serial_availability(struct udevice *dev) { - int serial_gpio = 15; - struct udevice *dev; + const void *fdt = gd->fdt_blob; + const fdt32_t *cell; + struct udevice *pin_dev; + u32 phandle; + int pin_func; + int pin; + int offset = 0; + int size; + int len; + int i; + + /* get the offset for this device's pinctrl-0 phandle */ + + cell = fdt_getprop(fdt, dev_of_offset(dev), "pinctrl-0", &size); + if (!cell) + return false; + + /* find the offset of the device's pinctrl-0 node */ + + while (size) { + phandle = fdt32_to_cpu(*cell++); + size -= sizeof(*cell); + + offset = fdt_node_offset_by_phandle(fdt, phandle); + if (offset < 0) { + /* bad offset, not found */ - if (uclass_first_device(UCLASS_PINCTRL, &dev) || !dev) + return false; + } + } + + /* check to make sure we found the pinctrl-0 node */ + + if (offset == 0) return false; - if (pinctrl_get_gpio_mux(dev, 0, serial_gpio) != BCM2835_GPIO_ALT0) + /* get the bcrm,pins property */ + + cell = fdt_getprop(fdt, offset, "brcm,pins", &len); + + if (!cell) { + /* no pin property, signal as unavailable */ + return false; + } + + /* find the pinctrl device */ + + if (uclass_first_device(UCLASS_PINCTRL, &pin_dev) || !pin_dev) + return false; + + /* if the pin list is empty, assume this is uart0 */ + + if (len < sizeof(int)) { + /* check that the Tx GPIO pin is muxed for the PL011 */ + + pin_func = pinctrl_get_gpio_mux(pin_dev, 0, UART0_GPIO_TX); + return bcm383x_check_gpio_mapping(UART0_GPIO_TX, pin_func); + } + + /* check the pin list for a valid PL011 mapping */ + + for (i = 0; i < len / sizeof(int); i++) { + /* get the function assigned to this pin */ + + pin = fdt32_to_cpu(cell[i]); + pin_func = pinctrl_get_gpio_mux(pin_dev, 0, pin); + + /* check the pin/function assignment */ + + if (bcm383x_check_gpio_mapping(pin, pin_func) == false) { + /* any failed pin checks makes the device unavailable */ + + return false; + } + } + + /* all checks pass, indicate device is available */ return true; } @@ -38,19 +156,19 @@ static int bcm283x_pl011_serial_ofdata_to_platdata(struct udevice *dev) struct pl01x_serial_platdata *plat = dev_get_platdata(dev); int ret; - /* Don't spawn the device if it's not muxed */ - if (!bcm283x_is_serial_muxed()) + /* don't spawn the device if it's not usable */ + + if (bcm383x_check_serial_availability(dev) == false) return -ENODEV; ret = pl01x_serial_ofdata_to_platdata(dev); if (ret) return ret; - /* - * TODO: Reinitialization doesn't always work for now, just skip - * init always - we know we're already initialized - */ - plat->skip_init = true; + /* default clock to 48MHz if the device tree didn't specificy a freq */ + + if (plat->clock == 1) + plat->clock = 48000000; return 0; } -- 2.7.4

2 2

[U-Boot] [PATCH] tools/Makefile: fix HOSTCFLAGS with CROSS_BUILD_TOOLS
by Fabrice Fontaine 14 Nov '19

14 Nov '19

When CROSS_BUILD_TOOLS is set, set HOSTCFLAGS to CFLAGS otherwise CC will be used with HOSTCFLAGS which seems wrong Signed-off-by: Fabrice Fontaine <fontaine.fabrice(a)gmail.com> --- tools/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/Makefile b/tools/Makefile index 12a3027e23..eadeba417d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -272,6 +272,7 @@ subdir- += env ifneq ($(CROSS_BUILD_TOOLS),) override HOSTCC = $(CC) +override HOSTCFLAGS = $(CFLAGS) quiet_cmd_crosstools_strip = STRIP $^ cmd_crosstools_strip = $(STRIP) $^; touch $@ -- 2.20.1

3 13

[U-Boot] [RESEND PATCH v2 00/13] ARM: davinci: driver-model improvements
by Bartosz Golaszewski 13 Nov '19

13 Nov '19

From: Bartosz Golaszewski <bgolaszewski(a)baylibre.com> NOTE: emac conversion is already upstream, so dropped it from this series. No other changes. The following series contains all the patches for davinci that have been sent to the mailing list recently rebased on top of v2019.07 and retested on da850-lcdk and da850-evm. I collected all the review and test tags too. Patches 1-4 fix build warnings due to legacy interfaces usage. Patches 5-8 add support for driver model to the davinci NAND driver. Patches 9-12 enable driver-model support in SPL for davinci. Last patch enables the driver model for NAND in SPL. v1 -> v2: - fixed a build error on da850_am18xx due to missing CONFIG_DM_ETH=y Bartosz Golaszewski (13): davinci: remove CONFIG_DM_I2C_COMPAT from defconfigs sandbox: remove CONFIG_DM_I2C_COMPAT from defconfigs i2c: remove i2c driver-model compatibility layer omapl138_lcdk_defconfig: don't build support for SPI nand: davinci: make davinci_nand_init() static nand: davinci: add support for driver model davinci: omapl138-lcdk: enable driver model for NAND davinci: da850-evm: enable driver model for NAND davinci: omapl138-lcdk: enable SPL_SYS_MALLOC_SIMPLE davinci: omapl138-lcdk: enable CONFIG_USE_TINY_PRINTF davinci: omapl138-lcdk: remove unneeded includes davinci: omapl138-lcdk: enable driver-model in SPL configs: omapl138_lcdk: enable NAND self-init in SPL Makefile | 7 - arch/arm/dts/da850-evm-u-boot.dtsi | 4 + arch/arm/dts/da850-lcdk-u-boot.dtsi | 4 + arch/arm/include/asm/ti-common/davinci_nand.h | 2 - board/davinci/da8xxevm/omapl138_lcdk.c | 18 ++- configs/da850_am18xxevm_defconfig | 1 - configs/da850evm_defconfig | 1 + configs/da850evm_direct_nor_defconfig | 1 + configs/da850evm_nand_defconfig | 1 + configs/omapl138_lcdk_defconfig | 15 +- configs/sandbox64_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/sandbox_flattree_defconfig | 1 - configs/sandbox_noblk_defconfig | 1 - configs/sandbox_spl_defconfig | 1 - configs/tools-only_defconfig | 1 - drivers/i2c/Kconfig | 13 +- drivers/i2c/Makefile | 1 - drivers/i2c/i2c-uclass-compat.c | 128 ------------------ drivers/mtd/nand/raw/davinci_nand.c | 48 ++++++- include/_exports.h | 3 +- include/configs/am3517_evm.h | 1 - include/configs/da850evm.h | 4 + include/configs/omapl138_lcdk.h | 8 -- include/exports.h | 3 +- include/i2c.h | 80 ----------- 26 files changed, 89 insertions(+), 260 deletions(-) delete mode 100644 drivers/i2c/i2c-uclass-compat.c -- 2.21.0

6 41

[U-Boot] Add support for imxrt
by Giulio Benetti 11 Nov '19

11 Nov '19

Hello everybody, I would like to port imxrt to u-boot and I would like to ask you: - do you have the interest on upstreaming it? if yes: I've seen how they've dealt with 'stm32' and 'stm32mp' that is similar to 'imxrt' and 'imx'. So should follow the same criterias for porting? I mean adding the new folder 'mach-imxrt'? Also, do I find some of you in IRC sometimes? Thanks in advance Best regards -- Giulio Benetti Benetti Engineering sas

3 10

[U-Boot] [PATCH] api: storage: Add the missing write operation support
by Cristian Ciocaltea 08 Nov '19

08 Nov '19

API_dev_write(va_list ap) is currently lacking the write support to storage devices because, historically, those devices did not implement block_write() The solution has been tested by loading and booting a (patched) GRUB instance in a QEMU vexpress-a9 environment. The disk write operations were triggered with GRUB's save_env command. Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea(a)gmail.com> --- api/api.c | 59 ++++++++++++++++++++++++++++++----------------- api/api_private.h | 1 + api/api_storage.c | 24 +++++++++++++++++++ 3 files changed, 63 insertions(+), 21 deletions(-) diff --git a/api/api.c b/api/api.c index 9f03f1a35b..f7cfcc9ebc 100644 --- a/api/api.c +++ b/api/api.c @@ -294,27 +294,31 @@ static int API_dev_close(va_list ap) /* - * Notice: this is for sending network packets only, as U-Boot does not - * support writing to storage at the moment (12.2007) - * * pseudo signature: * * int API_dev_write( * struct device_info *di, * void *buf, - * int *len + * int *len, + * unsigned long *start * ) * * buf: ptr to buffer from where to get the data to send * - * len: length of packet to be sent (in bytes) + * len: ptr to length to be read + * - network: len of packet to be sent (in bytes) + * - storage: # of blocks to write (can vary in size depending on define) * + * start: ptr to start block (only used for storage devices, ignored for + * network) */ static int API_dev_write(va_list ap) { struct device_info *di; void *buf; - int *len; + lbasize_t *len_stor, act_len_stor; + lbastart_t *start; + int *len_net; int err = 0; /* 1. arg is ptr to the device_info struct */ @@ -332,23 +336,36 @@ static int API_dev_write(va_list ap) if (buf == NULL) return API_EINVAL; - /* 3. arg is length of buffer */ - len = (int *)va_arg(ap, uintptr_t); - if (len == NULL) - return API_EINVAL; - if (*len <= 0) - return API_EINVAL; + if (di->type & DEV_TYP_STOR) { + /* 3. arg - ptr to var with # of blocks to write */ + len_stor = (lbasize_t *)va_arg(ap, uintptr_t); + if (!len_stor) + return API_EINVAL; + if (*len_stor <= 0) + return API_EINVAL; - if (di->type & DEV_TYP_STOR) - /* - * write to storage is currently not supported by U-Boot: - * no storage device implements block_write() method - */ - return API_ENODEV; + /* 4. arg - ptr to var with start block */ + start = (lbastart_t *)va_arg(ap, uintptr_t); - else if (di->type & DEV_TYP_NET) - err = dev_write_net(di->cookie, buf, *len); - else + act_len_stor = dev_write_stor(di->cookie, buf, *len_stor, *start); + if (act_len_stor != *len_stor) { + debugf("write @ %llu: done %llu out of %llu blocks", + (uint64_t)blk, (uint64_t)act_len_stor, + (uint64_t)len_stor); + return API_EIO; + } + + } else if (di->type & DEV_TYP_NET) { + /* 3. arg points to the var with length of packet to write */ + len_net = (int *)va_arg(ap, uintptr_t); + if (!len_net) + return API_EINVAL; + if (*len_net <= 0) + return API_EINVAL; + + err = dev_write_net(di->cookie, buf, *len_net); + + } else err = API_ENODEV; return err; diff --git a/api/api_private.h b/api/api_private.h index 8d97ca95a2..07fd50ad3a 100644 --- a/api/api_private.h +++ b/api/api_private.h @@ -22,6 +22,7 @@ int dev_close_stor(void *); int dev_close_net(void *); lbasize_t dev_read_stor(void *, void *, lbasize_t, lbastart_t); +lbasize_t dev_write_stor(void *, void *, lbasize_t, lbastart_t); int dev_read_net(void *, void *, int); int dev_write_net(void *, void *, int); diff --git a/api/api_storage.c b/api/api_storage.c index 2b90c18aae..7ae03ac230 100644 --- a/api/api_storage.c +++ b/api/api_storage.c @@ -349,3 +349,27 @@ lbasize_t dev_read_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start return dd->block_read(dd, start, len, buf); #endif /* defined(CONFIG_BLK) */ } + + +lbasize_t dev_write_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start) +{ + struct blk_desc *dd = (struct blk_desc *)cookie; + int type = dev_stor_type(dd); + + if (type == ENUM_MAX) + return 0; + + if (!dev_stor_is_valid(type, dd)) + return 0; + +#ifdef CONFIG_BLK + return blk_dwrite(dd, start, len, buf); +#else + if (dd->block_write == NULL) { + debugf("no block_write() for device 0x%08x\n", cookie); + return 0; + } + + return dd->block_write(dd, start, len, buf); +#endif /* defined(CONFIG_BLK) */ +} -- 2.17.1

2 1

[U-Boot] [PATCH 00/34] binman: Various improvements and tidy-ups
by Simon Glass 05 Nov '19

05 Nov '19

This series includes a number of minor improvements to binman, including: - Dropping some test Elf files and building them from source instead - Refactoring of x86 16-bit entries - Support for SPL symbols within sections - Handle the 'notes' sections and hidden symbols in recent binutils - Improved error reporting with a tool fails Simon Glass (34): patman: Drop binary parameter patman: Update command.Run() to handle failure better binman: Use cls instead of self for class methods binman: Allow use of help and entry-docs without libfdt binman: Drop .note section from ELF binman: Handle hidden symbols in ELF files binman: Correct use of 'replace' in IFWI tests binman: Add support for an x86 'reset' section binman: x86: Separate out 16-bit reset and init code binman: Add support for Intel FIT binman: Fix IFWI output when using an Intel FIT image binman: Use tools.Run() to run objdump binman: Use the Makefile to build ELF test files binman: Use the Makefile for u_boot_ucode_ptr binman: Use the Makefile for u_boot_no_ucode_ptr binman: Use the Makefile for u_boot_binman_syms binman: Use the Makefile for u_boot_binman_syms_size binman: Use the Makefile for u_boot_binman_syms_bad binman: Clean up unnecessary code related to ELF test files binman: Allow symbols to be resolved inside sections binman: Use underscore in test filenames binman: Rename some two-digit test files binman: Avoid needing the section size in advance binman: Increase size of TPL and SPL test data binman: Allow support for writing a size symbol to binaries binman: Correct symbol calculation with non-zero image base binman: Add support for Intel FSP meminit binman: Fix entry comment for Intel descriptor binman: Update IFWI entry to read entries outside constructor binman: Update IFWI entry to support updates binman: Support writing symbols into entries within an IFWI binman: Write symbol info before image inclusion binman: Add logging for the number of pack passes binman: Drop comment-out code in testUpdateFdtOutput() Makefile | 10 +- arch/x86/dts/u-boot.dtsi | 9 + scripts/Makefile.spl | 22 +- tools/binman/README.entries | 136 ++++++++-- tools/binman/control.py | 13 +- tools/binman/elf.py | 11 +- tools/binman/elf_test.py | 57 ++++- tools/binman/entry.py | 5 +- tools/binman/etype/blob.py | 1 - tools/binman/etype/blob_dtb.py | 6 +- tools/binman/etype/cbfs.py | 5 +- tools/binman/etype/fdtmap.py | 13 +- tools/binman/etype/files.py | 5 +- tools/binman/etype/intel_descriptor.py | 2 +- tools/binman/etype/intel_fit.py | 32 +++ tools/binman/etype/intel_fit_ptr.py | 41 +++ tools/binman/etype/intel_fsp_m.py | 27 ++ tools/binman/etype/intel_ifwi.py | 68 +++-- tools/binman/etype/section.py | 16 +- tools/binman/etype/u_boot_dtb_with_ucode.py | 5 +- tools/binman/etype/u_boot_spl.py | 2 +- tools/binman/etype/u_boot_tpl.py | 2 +- tools/binman/etype/x86_reset16.py | 29 +++ tools/binman/etype/x86_reset16_spl.py | 29 +++ tools/binman/etype/x86_reset16_tpl.py | 29 +++ tools/binman/etype/x86_start16.py | 15 +- tools/binman/etype/x86_start16_spl.py | 19 +- tools/binman/etype/x86_start16_tpl.py | 18 +- tools/binman/ftest.py | 241 ++++++++++++------ tools/binman/test/021_image_pad.dts | 2 +- tools/binman/test/024_sorted.dts | 2 +- tools/binman/test/028_pack_4gb_outside.dts | 2 +- .../test/{029_x86-rom.dts => 029_x86_rom.dts} | 2 +- ...no-desc.dts => 030_x86_rom_me_no_desc.dts} | 0 ...{031_x86-rom-me.dts => 031_x86_rom_me.dts} | 0 .../{032_intel-vga.dts => 032_intel_vga.dts} | 0 ...33_x86-start16.dts => 033_x86_start16.dts} | 0 .../{042_intel-fsp.dts => 042_intel_fsp.dts} | 0 .../{043_intel-cmc.dts => 043_intel_cmc.dts} | 0 .../{046_intel-vbt.dts => 046_intel_vbt.dts} | 0 ...tart16-spl.dts => 048_x86_start16_spl.dts} | 0 tools/binman/test/053_symbols.dts | 2 +- ...tart16-tpl.dts => 081_x86_start16_tpl.dts} | 0 ...=> 098_4gb_and_skip_at_start_together.dts} | 0 ..._x86-rom-ifwi.dts => 111_x86_rom_ifwi.dts} | 2 +- ...nodesc.dts => 112_x86_rom_ifwi_nodesc.dts} | 2 +- ...nodata.dts => 113_x86_rom_ifwi_nodata.dts} | 2 +- tools/binman/test/144_x86_reset16.dts | 13 + tools/binman/test/145_x86_reset16_spl.dts | 13 + tools/binman/test/146_x86_reset16_tpl.dts | 13 + tools/binman/test/147_intel_fit.dts | 20 ++ tools/binman/test/148_intel_fit_missing.dts | 17 ++ tools/binman/test/149_symbols_tpl.dts | 28 ++ ...> 150_powerpc_mpc85xx_bootpg_resetvec.dts} | 0 .../binman/test/151_x86_rom_ifwi_section.dts | 33 +++ tools/binman/test/152_intel_fsp_m.dts | 14 + tools/binman/test/Makefile | 14 +- tools/binman/test/bss_data | Bin 5020 -> 0 bytes tools/binman/test/u_boot_binman_syms | Bin 4924 -> 0 bytes tools/binman/test/u_boot_binman_syms.c | 1 + tools/binman/test/u_boot_binman_syms.lds | 3 +- tools/binman/test/u_boot_binman_syms_bad | Bin 4890 -> 0 bytes tools/binman/test/u_boot_binman_syms_size | Bin 4825 -> 0 bytes tools/binman/test/u_boot_no_ucode_ptr | Bin 4182 -> 0 bytes tools/binman/test/u_boot_ucode_ptr | Bin 4175 -> 0 bytes tools/binman/test/u_boot_ucode_ptr.lds | 3 +- tools/patman/cros_subprocess.py | 3 +- tools/patman/tools.py | 23 +- 68 files changed, 870 insertions(+), 212 deletions(-) create mode 100644 tools/binman/etype/intel_fit.py create mode 100644 tools/binman/etype/intel_fit_ptr.py create mode 100644 tools/binman/etype/intel_fsp_m.py create mode 100644 tools/binman/etype/x86_reset16.py create mode 100644 tools/binman/etype/x86_reset16_spl.py create mode 100644 tools/binman/etype/x86_reset16_tpl.py rename tools/binman/test/{029_x86-rom.dts => 029_x86_rom.dts} (87%) rename tools/binman/test/{030_x86-rom-me-no-desc.dts => 030_x86_rom_me_no_desc.dts} (100%) rename tools/binman/test/{031_x86-rom-me.dts => 031_x86_rom_me.dts} (100%) rename tools/binman/test/{032_intel-vga.dts => 032_intel_vga.dts} (100%) rename tools/binman/test/{033_x86-start16.dts => 033_x86_start16.dts} (100%) rename tools/binman/test/{042_intel-fsp.dts => 042_intel_fsp.dts} (100%) rename tools/binman/test/{043_intel-cmc.dts => 043_intel_cmc.dts} (100%) rename tools/binman/test/{046_intel-vbt.dts => 046_intel_vbt.dts} (100%) rename tools/binman/test/{048_x86-start16-spl.dts => 048_x86_start16_spl.dts} (100%) rename tools/binman/test/{081_x86-start16-tpl.dts => 081_x86_start16_tpl.dts} (100%) rename tools/binman/test/{80_4gb_and_skip_at_start_together.dts => 098_4gb_and_skip_at_start_together.dts} (100%) rename tools/binman/test/{111_x86-rom-ifwi.dts => 111_x86_rom_ifwi.dts} (95%) rename tools/binman/test/{112_x86-rom-ifwi-nodesc.dts => 112_x86_rom_ifwi_nodesc.dts} (95%) rename tools/binman/test/{113_x86-rom-ifwi-nodata.dts => 113_x86_rom_ifwi_nodata.dts} (95%) create mode 100644 tools/binman/test/144_x86_reset16.dts create mode 100644 tools/binman/test/145_x86_reset16_spl.dts create mode 100644 tools/binman/test/146_x86_reset16_tpl.dts create mode 100644 tools/binman/test/147_intel_fit.dts create mode 100644 tools/binman/test/148_intel_fit_missing.dts create mode 100644 tools/binman/test/149_symbols_tpl.dts rename tools/binman/test/{81_powerpc_mpc85xx_bootpg_resetvec.dts => 150_powerpc_mpc85xx_bootpg_resetvec.dts} (100%) create mode 100644 tools/binman/test/151_x86_rom_ifwi_section.dts create mode 100644 tools/binman/test/152_intel_fsp_m.dts delete mode 100755 tools/binman/test/bss_data delete mode 100755 tools/binman/test/u_boot_binman_syms delete mode 100755 tools/binman/test/u_boot_binman_syms_bad delete mode 100755 tools/binman/test/u_boot_binman_syms_size delete mode 100755 tools/binman/test/u_boot_no_ucode_ptr delete mode 100755 tools/binman/test/u_boot_ucode_ptr -- 2.23.0.187.g17f5b7556c-goog

4 73