November 2018 - U-Boot

[U-Boot] [PATCH v2] armv8: ls2080ardb: enable eSDHC pin mux support
by Yinbo Zhu 12 Dec '18

12 Dec '18

CONFIG_FSL_ESDHC_PIN_MUX should be enabled for ls2080ardb whose eSDHC has pin mux with DSPI. This config makes sure esdhc dts node would be fixed with disabled status if DSPI is used, in case of any mmc issue in linux. Also, esdhc should be added in default hwconfig since eSDHC is used in default. Signed-off-by: Yinbo Zhu <yinbo.zhu(a)nxp.com> --- Change in v2: Update the commit information. include/configs/ls2080ardb.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index f6aa4ed..d2e80a8 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -331,6 +331,7 @@ unsigned long get_board_sys_clk(void); /* MMC */ #ifdef CONFIG_MMC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 +#define CONFIG_FSL_ESDHC_PIN_MUX #endif #define BOOT_TARGET_DEVICES(func) \ @@ -390,7 +391,7 @@ unsigned long get_board_sys_clk(void); #undef CONFIG_EXTRA_ENV_SETTINGS #ifdef CONFIG_TFABOOT #define CONFIG_EXTRA_ENV_SETTINGS \ - "hwconfig=fsl_ddr:bank_intlv=auto\0" \ + "hwconfig=fsl_ddr:bank_intlv=auto;esdhc\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \ "fdt_high=0xa0000000\0" \ @@ -459,7 +460,7 @@ unsigned long get_board_sys_clk(void); "bootm $load_addr#$board\0" #else #define CONFIG_EXTRA_ENV_SETTINGS \ - "hwconfig=fsl_ddr:bank_intlv=auto\0" \ + "hwconfig=fsl_ddr:bank_intlv=auto;esdhc\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \ "fdt_high=0xa0000000\0" \ -- 1.7.1

2 1

[U-Boot] [PATCH v1] LS2080ardb: MMC: disable esdhc for dspi
by Yinbo Zhu 12 Dec '18

12 Dec '18

esdhc and dspi have Multiplexed pins, if dspi is enabled and esdhc need to be disabled, This patch is to disable esdhc when rcw config dspi enabled. Signed-off-by: Yinbo Zhu <yinbo.zhu(a)nxp.com> --- include/configs/ls2080ardb.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index f6aa4ed..d2e80a8 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -331,6 +331,7 @@ unsigned long get_board_sys_clk(void); /* MMC */ #ifdef CONFIG_MMC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 +#define CONFIG_FSL_ESDHC_PIN_MUX #endif #define BOOT_TARGET_DEVICES(func) \ @@ -390,7 +391,7 @@ unsigned long get_board_sys_clk(void); #undef CONFIG_EXTRA_ENV_SETTINGS #ifdef CONFIG_TFABOOT #define CONFIG_EXTRA_ENV_SETTINGS \ - "hwconfig=fsl_ddr:bank_intlv=auto\0" \ + "hwconfig=fsl_ddr:bank_intlv=auto;esdhc\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \ "fdt_high=0xa0000000\0" \ @@ -459,7 +460,7 @@ unsigned long get_board_sys_clk(void); "bootm $load_addr#$board\0" #else #define CONFIG_EXTRA_ENV_SETTINGS \ - "hwconfig=fsl_ddr:bank_intlv=auto\0" \ + "hwconfig=fsl_ddr:bank_intlv=auto;esdhc\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \ "fdt_high=0xa0000000\0" \ -- 1.7.1

3 2

[U-Boot] [PATCH] armv8: Secure Boot: Modify boot_a_script definition
by Vinitha V Pillai 12 Dec '18

12 Dec '18

boot_script_hdr does not exist, it should not continue to boot. So adding separate validation after loading boot_script Signed-off-by: Vinitha V Pillai <vinitha.pillai(a)nxp.com> --- include/configs/ls1012afrwy.h | 3 ++- include/configs/ls1012ardb.h | 3 ++- include/configs/ls1021atwr.h | 3 ++- include/configs/ls1043a_common.h | 3 ++- include/configs/ls1046a_common.h | 5 +++-- include/configs/ls1088ardb.h | 3 ++- include/configs/ls2080ardb.h | 3 ++- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/include/configs/ls1012afrwy.h b/include/configs/ls1012afrwy.h index ebb1df41c7..12e6437a05 100644 --- a/include/configs/ls1012afrwy.h +++ b/include/configs/ls1012afrwy.h @@ -98,7 +98,8 @@ "${scriptaddr} ${prefix}${script}; " \ "env exists secureboot && load ${devtype} " \ "${devnum}:${distro_bootpart} " \ - "${scripthdraddr} ${prefix}${boot_script_hdr} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr}; " \ + "env exists secureboot " \ "&& esbc_validate ${scripthdraddr};" \ "source ${scriptaddr}\0" \ "installer=load mmc 0:2 $load_addr " \ diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index f149a604cf..f6640fa499 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -98,7 +98,8 @@ "${scriptaddr} ${prefix}${script}; " \ "env exists secureboot && load ${devtype} " \ "${devnum}:${distro_bootpart} " \ - "${scripthdraddr} ${prefix}${boot_script_hdr} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr}; " \ + "env exists secureboot " \ "&& esbc_validate ${scripthdraddr};" \ "source ${scriptaddr}\0" \ "installer=load mmc 0:2 $load_addr " \ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index ddd024e8c0..70af3ebb8f 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -364,7 +364,8 @@ "${scriptaddr} ${prefix}${script}; " \ "env exists secureboot && load ${devtype} " \ "${devnum}:${distro_bootpart} " \ - "${scripthdraddr} ${prefix}${boot_script_hdr} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr}; " \ + "env exists secureboot " \ "&& esbc_validate ${scripthdraddr};" \ "source ${scriptaddr}\0" \ "installer=load mmc 0:2 $load_addr " \ diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 7875bf4bba..3d6ce2cafb 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -294,7 +294,8 @@ "${scriptaddr} ${prefix}${script}; " \ "env exists secureboot && load ${devtype} " \ "${devnum}:${distro_bootpart} " \ - "${scripthdraddr} ${prefix}${boot_script_hdr} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr}; " \ + "env exists secureboot " \ "&& esbc_validate ${scripthdraddr};" \ "source ${scriptaddr}\0" \ "qspi_bootcmd=echo Trying load from qspi..;" \ diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 6e36c9339b..4ac31c59dd 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -271,8 +271,9 @@ "${scriptaddr} ${prefix}${script}; " \ "env exists secureboot && load ${devtype} " \ "${devnum}:${distro_bootpart} " \ - "${scripthdraddr} ${prefix}${boot_script_hdr} " \ - "&& esbc_validate ${scripthdraddr};" \ + "${scripthdraddr} ${prefix}${boot_script_hdr}; " \ + "env exists secureboot " \ + "&& esbc_validate ${scripthdraddr};" \ "source ${scriptaddr}\0" \ "qspi_bootcmd=echo Trying load from qspi..;" \ "sf probe && sf read $load_addr " \ diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 2391a7cc05..b5a9f68dda 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -407,7 +407,8 @@ "${scriptaddr} ${prefix}${script}; " \ "env exists secureboot && load ${devtype} " \ "${devnum}:${distro_bootpart} " \ - "${scripthdraddr} ${prefix}${boot_script_hdr} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr}; "\ + "env exists secureboot " \ "&& esbc_validate ${scripthdraddr};" \ "source ${scriptaddr}\0" \ "installer=load mmc 0:2 $load_addr " \ diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index a8e872ebd5..f6aa4ed2e8 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -511,7 +511,8 @@ unsigned long get_board_sys_clk(void); "${scriptaddr} ${prefix}${script}; " \ "env exists secureboot && load ${devtype} " \ "${devnum}:${distro_bootpart} " \ - "${scripthdraddr} ${prefix}${boot_script_hdr} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr}; " \ + "env exists secureboot " \ "&& esbc_validate ${scripthdraddr};" \ "source ${scriptaddr}\0" \ "qspi_bootcmd=echo Trying load from qspi..;" \ -- 2.17.1

2 1

[U-Boot] [PATCH 00/13] dm: DM_FLAG_PRE_RELOC flag clean up
by Bin Meng 12 Dec '18

12 Dec '18

When a driver declares DM_FLAG_PRE_RELOC flag, it wishes to be bound before relocation. However due to a bug in the DM core, the flag only takes effect when devices are statically declared via U_BOOT_DEVICE(). This bug has been fixed recently by commit "dm: core: Respect drivers with the DM_FLAG_PRE_RELOC flag in lists_bind_fdt()", but with the fix, it has a side effect that all existing drivers that declared DM_FLAG_PRE_RELOC flag will be bound before relocation now. This may expose potential boot failure on some boards due to insufficient memory during the pre-relocation stage. To mitigate this potential impact, the following changes are implemented: - Remove DM_FLAG_PRE_RELOC flag in the driver, if the driver only supports configuration from device tree (OF_CONTROL) - Keep DM_FLAG_PRE_RELOC flag in the driver only if the device is statically declared via U_BOOT_DEVICE() - Surround DM_FLAG_PRE_RELOC flag with OF_CONTROL check, for drivers that support both statically declared devices and configuration from device tree This series should be applied on top of u-boot-dm/master, for v2018.11 release. Bin Meng (13): arm: stm32mp: Remove DM_FLAG_PRE_RELOC flag clk: Remove DM_FLAG_PRE_RELOC flag in various drivers gpio: Remove DM_FLAG_PRE_RELOC flag in various drivers i2c: omap24xx: Surround DM_FLAG_PRE_RELOC flag with OF_CONTROL check mmc: omap: Surround DM_FLAG_PRE_RELOC flag with OF_CONTROL check pinctrl: Remove DM_FLAG_PRE_RELOC flag in various drivers ram: bmips: Remove DM_FLAG_PRE_RELOC flag timer: Remove DM_FLAG_PRE_RELOC flag in various drivers serial: Remove DM_FLAG_PRE_RELOC flag in various drivers sysreset: Remove DM_FLAG_PRE_RELOC flag in various drivers video: simplefb: Remove DM_FLAG_PRE_RELOC flag watchdog: Remove DM_FLAG_PRE_RELOC flag in various drivers dm: doc: Update description of pre-relocation support arch/arm/mach-stm32mp/bsec.c | 1 - arch/x86/cpu/tangier/sysreset.c | 1 - doc/driver-model/README.txt | 16 ++++++++++++---- drivers/clk/altera/clk-arria10.c | 1 - drivers/clk/clk_pic32.c | 1 - drivers/clk/clk_zynq.c | 1 - drivers/clk/exynos/clk-exynos7420.c | 3 --- drivers/clk/owl/clk_s900.c | 1 - drivers/gpio/omap_gpio.c | 2 ++ drivers/gpio/stm32f7_gpio.c | 2 +- drivers/gpio/tegra186_gpio.c | 1 - drivers/gpio/tegra_gpio.c | 1 - drivers/i2c/omap24xx_i2c.c | 2 ++ drivers/mmc/omap_hsmmc.c | 2 ++ drivers/pinctrl/broadcom/pinctrl-bcm283x.c | 2 ++ drivers/pinctrl/exynos/pinctrl-exynos7420.c | 1 - drivers/pinctrl/nxp/pinctrl-imx5.c | 2 ++ drivers/pinctrl/nxp/pinctrl-imx6.c | 2 ++ drivers/pinctrl/nxp/pinctrl-imx7.c | 2 ++ drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 2 ++ drivers/pinctrl/pinctrl-single.c | 1 - drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 2 ++ drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 2 ++ drivers/ram/bmips_ram.c | 1 - drivers/serial/altera_jtag_uart.c | 1 - drivers/serial/altera_uart.c | 1 - drivers/serial/arm_dcc.c | 1 - drivers/serial/atmel_usart.c | 2 ++ drivers/serial/ns16550.c | 2 ++ drivers/serial/serial_ar933x.c | 1 - drivers/serial/serial_arc.c | 1 - drivers/serial/serial_bcm283x_mu.c | 2 ++ drivers/serial/serial_bcm283x_pl011.c | 2 ++ drivers/serial/serial_bcm6345.c | 1 - drivers/serial/serial_efi.c | 1 - drivers/serial/serial_intel_mid.c | 1 - drivers/serial/serial_lpuart.c | 1 - drivers/serial/serial_meson.c | 1 - drivers/serial/serial_mvebu_a3700.c | 1 - drivers/serial/serial_mxc.c | 2 ++ drivers/serial/serial_omap.c | 2 ++ drivers/serial/serial_owl.c | 1 - drivers/serial/serial_pic32.c | 1 - drivers/serial/serial_pl01x.c | 2 ++ drivers/serial/serial_s5p.c | 1 - drivers/serial/serial_sh.c | 2 ++ drivers/serial/serial_sti_asc.c | 1 - drivers/serial/serial_stm32.c | 2 ++ drivers/serial/serial_xuartlite.c | 1 - drivers/serial/serial_zynq.c | 1 - drivers/sysreset/sysreset_x86.c | 1 - drivers/timer/ag101p_timer.c | 1 - drivers/timer/altera_timer.c | 1 - drivers/timer/arc_timer.c | 1 - drivers/timer/ast_timer.c | 1 - drivers/timer/atcpit100_timer.c | 1 - drivers/timer/atmel_pit_timer.c | 1 - drivers/timer/cadence-ttc.c | 1 - drivers/timer/dw-apb-timer.c | 1 - drivers/timer/mpc83xx_timer.c | 1 - drivers/timer/omap-timer.c | 1 - drivers/timer/rockchip_timer.c | 1 - drivers/timer/sti-timer.c | 1 - drivers/timer/stm32_timer.c | 1 - drivers/timer/tsc_timer.c | 1 - drivers/video/simplefb.c | 1 - drivers/watchdog/ast_wdt.c | 1 - lib/efi/efi_app.c | 1 - 68 files changed, 51 insertions(+), 54 deletions(-) -- 2.7.4

8 49

[U-Boot] [PATCH 0/4] efi_loader: non-volatile variables support
by AKASHI Takahiro 11 Dec '18

11 Dec '18

As the subject suggested, this patch set allows any efi variable to be volatile or non-volatile as UEFI specification describes. With my efishell patch[1] with patch #2, you can try as follows: => efi setvar PlatformLang en => efi setvar -nv BootNext =H0200 => env save BootNext will be preserved across reboot, while PlatformLang not. Please note that, currently, setvar command does not automatically append NON_VOLATILE attribute, while UEFI specification expects that PlatformLang be non-volatile, you'd better also specify -nv for this variable here. Patch #2/#3 depend on my efishell patch[1]. Patch #4 depends on my BootNext patch[2]. Patch[1] and [2] have not been merged yet, so patch#1 can be applied on its own. [1] https://lists.denx.de/pipermail/u-boot/2018-November/346450.html [2] https://lists.denx.de/pipermail/u-boot/2018-November/349281.html AKASHI Takahiro (4): efi_loader: support non-volatile variable behavior cmd: efishell: support -nv option to setvar sub-command cmd: efishell: make Boot####/BootOrder variable non-volatile efi_loader: bootmgr: make BootNext non-volatile cmd/efishell.c | 20 ++++++++--- env/env.c | 4 +++ include/efi_loader.h | 1 + lib/efi_loader/efi_bootmgr.c | 3 +- lib/efi_loader/efi_variable.c | 64 +++++++++++++++++++++++++++++++++-- 5 files changed, 84 insertions(+), 8 deletions(-) -- 2.19.1

4 11

[U-Boot] [PATCH u-boot-marvell v3 01/10] board: turris_mox: Cosmetic restructurization
by Marek Behún 11 Dec '18

11 Dec '18

Restructure the board initialization source. Remove the module_topology environment variable since it won't be needed. Signed-off-by: Marek Behún <marek.behun(a)nic.cz> --- board/CZ.NIC/turris_mox/turris_mox.c | 136 ++++++++++++++++++--------- 1 file changed, 89 insertions(+), 47 deletions(-) diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index c4622a49c2..415c462493 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -135,17 +135,15 @@ int board_init(void) return 0; } -int last_stage_init(void) +static int mox_do_spi(u8 *in, u8 *out, size_t size) { struct spi_slave *slave; struct udevice *dev; - u8 din[10], dout[10]; - int ret, i; - size_t len = 0; - char module_topology[128]; + int ret; - ret = spi_get_bus_and_cs(0, 1, 20000000, SPI_CPHA, "spi_generic_drv", - "mox-modules@1", &dev, &slave); + ret = spi_get_bus_and_cs(0, 1, 1000000, SPI_CPHA | SPI_CPOL, + "spi_generic_drv", "moxtet@1", &dev, + &slave); if (ret) goto fail; @@ -153,57 +151,101 @@ int last_stage_init(void) if (ret) goto fail_free; - memset(din, 0, 10); - memset(dout, 0, 10); + ret = spi_xfer(slave, size * 8, out, in, SPI_XFER_ONCE); + + spi_release_bus(slave); +fail_free: + spi_free_slave(slave); +fail: + return ret; +} + +static int mox_get_topology(const u8 **ptopology, int *psize, int *pis_sd) +{ + static int is_sd; + static u8 topology[MAX_MOX_MODULES - 1]; + static int size; + u8 din[MAX_MOX_MODULES], dout[MAX_MOX_MODULES]; + int ret, i; - ret = spi_xfer(slave, 80, dout, din, SPI_XFER_ONCE); + if (size) { + if (ptopology) + *ptopology = topology; + if (psize) + *psize = size; + if (pis_sd) + *pis_sd = is_sd; + return 0; + } + + memset(din, 0, MAX_MOX_MODULES); + memset(dout, 0, MAX_MOX_MODULES); + + ret = mox_do_spi(din, dout, MAX_MOX_MODULES); if (ret) - goto fail_release; + return ret; + + if (din[0] == 0x10) + is_sd = 1; + else if (din[0] == 0x00) + is_sd = 0; + else + return -ENODEV; + + for (i = 1; i < MAX_MOX_MODULES && din[i] != 0xff; ++i) + topology[i - 1] = din[i] & 0xf; + size = i - 1; + + if (ptopology) + *ptopology = topology; + if (psize) + *psize = size; + if (pis_sd) + *pis_sd = is_sd; + + return 0; +} - if (din[0] != 0x00 && din[0] != 0xff) - goto fail_release; +int last_stage_init(void) +{ + int ret, i; + const u8 *topology; + int module_count, is_sd; + + ret = mox_get_topology(&topology, &module_count, &is_sd); + if (ret) { + printf("Cannot read module topology!\n"); + return 0; + } + printf("Found Turris Mox %s version\n", is_sd ? "SD" : "eMMC"); printf("Module Topology:\n"); - for (i = 1; i < 10 && din[i] != 0xff; ++i) { - u8 mid = din[i] & 0xf; - size_t mlen; - const char *mname = ""; - - switch (mid) { - case 0x1: - mname = "sfp-"; - printf("% 4i: SFP Module\n", i); + for (i = 0; i < module_count; ++i) { + switch (topology[i]) { + case MOX_MODULE_SFP: + printf("% 4i: SFP Module\n", i + 1); + break; + case MOX_MODULE_PCI: + printf("% 4i: Mini-PCIe Module\n", i + 1); + break; + case MOX_MODULE_TOPAZ: + printf("% 4i: Topaz Switch Module (4-port)\n", i + 1); break; - case 0x2: - mname = "pci-"; - printf("% 4i: Mini-PCIe Module\n", i); + case MOX_MODULE_PERIDOT: + printf("% 4i: Peridot Switch Module (8-port)\n", i + 1); break; - case 0x3: - mname = "topaz-"; - printf("% 4i: Topaz Switch Module\n", i); + case MOX_MODULE_USB3: + printf("% 4i: USB 3.0 Module (4 ports)\n", i + 1); + break; + case MOX_MODULE_PASSPCI: + printf("% 4i: Passthrough Mini-PCIe Module\n", i + 1); break; default: - printf("% 4i: unknown (ID %i)\n", i, mid); - } - - mlen = strlen(mname); - if (len + mlen < sizeof(module_topology)) { - strcpy(module_topology + len, mname); - len += mlen; + printf("% 4i: unknown (ID %i)\n", i + 1, topology[i]); } } - printf("\n"); - - module_topology[len > 0 ? len - 1 : 0] = '\0'; - env_set("module_topology", module_topology); + printf("\n"); -fail_release: - spi_release_bus(slave); -fail_free: - spi_free_slave(slave); -fail: - if (ret) - printf("Cannot read module topology!\n"); - return ret; + return 0; } -- 2.18.1

2 23

[U-Boot] Please pull u-boot-dm
by Simon Glass 11 Dec '18

11 Dec '18

Hi Tom, The following changes since commit e16c888fab5014b022d5781dc534f204460a073b: Merge branch '2018-11-28-master-imports' (2018-11-28 23:04:58 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/pull-29nov18 for you to fetch changes up to 5ca3927deff30458f5d5b384f6699f70b9509315: core: ofnode: Add ofnode_get_addr_size_index (2018-11-29 09:30:06 -0700) Results here: https://travis-ci.org/sglass68/u-boot/builds/461363284 ---------------------------------------------------------------- Fix sound on sandbox Convert TPM fully to DM Tidy up sandbox I2C emulation Add a 'make qcheck' target for faster testing A few other misc things ---------------------------------------------------------------- Baruch Siach (1): ofnode: fix comment typo Heiko Schocher (1): cmd, fdt: add subcommand "get" to fdt header Keerthy (2): core: ofnode: Fix ofnode_get_addr_index function core: ofnode: Add ofnode_get_addr_size_index Simon Glass (17): malloc_simple: Add logging of allocations power: pmic: Correct debug/error output test: Add a 'make qcheck' target for quicker testing dm: core: Export uclass_find_device_by_phandle() dm: core: Add a few more specific child-finding functions dm: core: Put UCLASS_SIMPLE_BUS in order dm: sandbox: i2c: Add a new 'emulation parent' uclass dm: sandbox: i2c: Use new emulator parent uclass rtc: Allow child drivers sound: Correct data output in sound_create_square_wave() sound: Add sample rate as a parameter for square wave sound: sandbox: Use the correct frequency sandbox: Enable sound sandbox: Use memmove() to move overlapping regions tpm: Add a constant for the minimum supported digest size tpm: Export the open/close functions tpm: Convert to use a device parameter Makefile | 6 +- arch/sandbox/cpu/os.c | 5 +- arch/sandbox/cpu/sdl.c | 30 ++---- arch/sandbox/dts/sandbox.dts | 25 +++-- arch/sandbox/dts/sandbox64.dts | 21 ++-- arch/sandbox/dts/sandbox_pmic.dtsi | 71 +++++++------ arch/sandbox/dts/test.dts | 28 +++-- board/gdsys/a38x/controlcenterdc.c | 25 ++++- board/gdsys/a38x/hre.c | 66 +++++++----- board/gdsys/a38x/hre.h | 2 +- board/gdsys/a38x/keyprogram.c | 12 ++- board/gdsys/a38x/keyprogram.h | 4 +- board/gdsys/p1022/controlcenterd-id.c | 117 +++++++++++++-------- cmd/fdt.c | 40 ++++++- cmd/tpm-common.c | 8 +- cmd/tpm-v1.c | 140 ++++++++++++++++++++---- cmd/tpm-v2.c | 78 +++++++++++--- cmd/tpm_test.c | 327 ++++++++++++++++++++++++++++++--------------------------- common/malloc_simple.c | 58 ++++++---- drivers/core/device.c | 34 ++++++ drivers/core/ofnode.c | 25 +++-- drivers/core/uclass.c | 6 +- drivers/i2c/i2c-emul-uclass.c | 77 ++++++++++++++ drivers/i2c/sandbox_i2c.c | 20 +--- drivers/power/pmic/act8846.c | 2 +- drivers/power/pmic/as3722.c | 14 +-- drivers/power/pmic/as3722_gpio.c | 11 +- drivers/power/pmic/i2c_pmic_emul.c | 2 +- drivers/power/pmic/lp873x.c | 6 +- drivers/power/pmic/lp87565.c | 6 +- drivers/power/pmic/max77686.c | 8 +- drivers/power/pmic/max8997.c | 4 +- drivers/power/pmic/max8998.c | 4 +- drivers/power/pmic/mc34708.c | 4 +- drivers/power/pmic/palmas.c | 8 +- drivers/power/pmic/pfuze100.c | 6 +- drivers/power/pmic/rk8xx.c | 6 +- drivers/power/pmic/rn5t567.c | 4 +- drivers/power/pmic/s2mps11.c | 8 +- drivers/power/pmic/s5m8767.c | 6 +- drivers/power/pmic/sandbox.c | 4 +- drivers/power/pmic/stpmu1.c | 2 +- drivers/power/pmic/tps65090.c | 8 +- drivers/rtc/rtc-uclass.c | 1 + drivers/sound/sound-i2s.c | 3 +- drivers/sound/sound.c | 8 +- drivers/tpm/tpm_tis_lpc.c | 47 +++++---- include/dm/device.h | 25 +++++ include/dm/ofnode.h | 16 ++- include/dm/uclass-id.h | 3 +- include/dm/uclass-internal.h | 17 +++ include/i2c.h | 21 ++++ include/log.h | 2 +- include/malloc.h | 1 + include/sound.h | 4 +- include/tpm-common.h | 36 ++++++- include/tpm-v1.h | 97 +++++++++++------ include/tpm-v2.h | 49 ++++++--- lib/tpm-common.c | 16 +-- lib/tpm-utils.h | 21 +--- lib/tpm-v1.c | 142 +++++++++++++------------ lib/tpm-v2.c | 60 ++++++----- test/README | 6 +- test/dm/i2c.c | 2 +- test/dm/rtc.c | 9 +- test/dm/test-fdt.c | 47 +++++++++ test/py/tests/test_fs/test_basic.py | 1 + test/py/tests/test_fs/test_ext.py | 1 + test/py/tests/test_fs/test_mkdir.py | 1 + test/py/tests/test_fs/test_unlink.py | 1 + test/run | 10 +- 71 files changed, 1305 insertions(+), 680 deletions(-) Regards, Simon

3 4

[U-Boot] [PATCH 1/4] scsi: ceva: add ls1046a soc support
by Peng Ma 11 Dec '18

11 Dec '18

Add ahci compatible support for ls1046a soc. Signed-off-by: Peng Ma <peng.ma(a)nxp.com> --- drivers/ata/sata_ceva.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c index 65896d1..a2d21d9 100644 --- a/drivers/ata/sata_ceva.c +++ b/drivers/ata/sata_ceva.c @@ -99,6 +99,7 @@ enum ceva_soc { CEVA_LS1012A, CEVA_LS1021A, CEVA_LS1043A, + CEVA_LS1046A, }; struct ceva_sata_priv { @@ -138,6 +139,7 @@ static int ceva_init_sata(struct ceva_sata_priv *priv) case CEVA_LS1012A: case CEVA_LS1043A: + case CEVA_LS1046A: writel(ECC_DIS_ADDR_CH2, ECC_DIS_VAL_CH2); writel(CEVA_PHY1_CFG, base + AHCI_VEND_PPCFG); writel(CEVA_TRANS_CFG, base + AHCI_VEND_PTC); @@ -170,6 +172,7 @@ static const struct udevice_id sata_ceva_ids[] = { { .compatible = "fsl,ls1012a-ahci", .data = CEVA_LS1012A }, { .compatible = "fsl,ls1021a-ahci", .data = CEVA_LS1021A }, { .compatible = "fsl,ls1043a-ahci", .data = CEVA_LS1043A }, + { .compatible = "fsl,ls1046a-ahci", .data = CEVA_LS1046A }, { } }; -- 1.7.1

2 5

[U-Boot] [PATCH v2 2/8] fdt: parse "reserved-memory" for memory reservation
by Simon Goldschmidt 11 Dec '18

11 Dec '18

boot_fdt_add_mem_rsv_regions() adds reserved memory sections to an lmb struct. Currently, it only parses regions described by /memreserve/ entries. Extend this to the more commonly used scheme of the "reserved-memory" node. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- Changes in v2: - this patch is new in v2 common/image-fdt.c | 52 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/common/image-fdt.c b/common/image-fdt.c index 95748f0ae1..65984c3c98 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -10,6 +10,7 @@ #include <common.h> #include <fdt_support.h> +#include <fdtdec.h> #include <errno.h> #include <image.h> #include <linux/libfdt.h> @@ -67,30 +68,65 @@ static const image_header_t *image_get_fdt(ulong fdt_addr) } #endif +static void boot_fdt_reserve_region(struct lmb *lmb, uint64_t addr, + uint64_t size) +{ + int ret; + + ret = lmb_reserve(lmb, addr, size); + if (!ret) + debug(" reserving fdt memory region: addr=%llx size=%llx\n", + (unsigned long long)addr, (unsigned long long)size); + else + puts("ERROR: reserving fdt memory region failed "); + printf("(addr=%llx size=%llx)\n", + (unsigned long long)addr, (unsigned long long)size); +} + /** - * boot_fdt_add_mem_rsv_regions - Mark the memreserve sections as unusable + * boot_fdt_add_mem_rsv_regions - Mark the memreserve and reserved-memory + * sections as unusable * @lmb: pointer to lmb handle, will be used for memory mgmt * @fdt_blob: pointer to fdt blob base address * - * Adds the memreserve regions in the dtb to the lmb block. Adding the - * memreserve regions prevents u-boot from using them to store the initrd - * or the fdt blob. + * Adds the and reserved-memorymemreserve regions in the dtb to the lmb block. + * Adding the memreserve regions prevents u-boot from using them to store the + * initrd or the fdt blob. */ void boot_fdt_add_mem_rsv_regions(struct lmb *lmb, void *fdt_blob) { uint64_t addr, size; - int i, total; + int i, total, ret; + int nodeoffset, subnode; + struct fdt_resource res; if (fdt_check_header(fdt_blob) != 0) return; + /* process memreserve sections */ total = fdt_num_mem_rsv(fdt_blob); for (i = 0; i < total; i++) { if (fdt_get_mem_rsv(fdt_blob, i, &addr, &size) != 0) continue; - printf(" reserving fdt memory region: addr=%llx size=%llx\n", - (unsigned long long)addr, (unsigned long long)size); - lmb_reserve(lmb, addr, size); + boot_fdt_reserve_region(lmb, addr, size); + } + + /* process reserved-memory */ + nodeoffset = fdt_subnode_offset(fdt_blob, 0, "reserved-memory"); + if (nodeoffset >= 0) { + subnode = fdt_first_subnode(fdt_blob, nodeoffset); + while (subnode >= 0) { + /* check if this subnode has a reg property */ + ret = fdt_get_resource(fdt_blob, subnode, "reg", 0, + &res); + if (!ret) { + addr = res.start; + size = res.end - res.start + 1; + boot_fdt_reserve_region(lmb, addr, size); + } + + subnode = fdt_next_subnode(fdt_blob, subnode); + } } } -- 2.17.1

2 4

[U-Boot] [RFC] fit: include uncompression into fit_image_load
by Simon Goldschmidt 11 Dec '18

11 Dec '18

Currently, only the kernel can be compressed in a FIT image. By moving the uncompression logic to 'fit_image_load()', all types of images can be compressed. This works perfectly for me when using a gzip'ed FPGA image in a FIT image on a cyclone5 board (socrates). Also, a gzip'ed initrd being unzipped by U-Boot (not the kernel) worked. To clean this up, the uncompression function would have to be moved from bootm.c ('bootm_decomp_image()') to a more generic location, but I decided to keep it for now to make the patch easier to read. Because of this setup, the kernel is currently uncompressed twice. which doesn't work... There are, however, some more things to discuss: - The max. size passed to gunzip() (etc.) is not known before, so we currently configure this to 8 MByte in U-Boot (via CONFIG_SYS_BOOTM_LEN), which proved too small for my initrd... - CONFIG_SYS_BOOTM_LEN is set to 64 MByte default in SPL, so it's a different default for SPL than for U-Boot !?! - CONFIG_SYS_BOOTM_LEN seemed to initially be used for kernel uncompression but is now used as a copy-only limit, too (no unzip) - Uncompression only works if a load address is given, what should happen if the FIT image does not contain a load address? - The whole memory management around FIT images is a bit messed up in that memory allocation is a mix of where U-Boot relocates itself (and which address ranges it used), the load addresses of the FIT image and the load addresses of the FIT image contents (and sizes). What's the point here to check CONFIG_SYS_BOOTM_LEN? Maybe it would be better to keep a memory map of allowed and already used data to check if we're overwriting things or to get the maximum size passed to gunzip etc.? - Some code paths (like the command 'fpga loadmk') directly use 'fit_image_get_data()'. These will have to be converted to use 'fit_image_load()' instead (which will do nothing if the subimage does not contain a load address. - 'fit_image_load()' should probably check for subimages that have a compression set but no load address... Or should we try to malloc() here? A long list of questions, hopefully someone will join me in discussing them :-) Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- common/bootm.c | 8 ++++---- common/image-fit.c | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/common/bootm.c b/common/bootm.c index 8bf84ebcb7..6b85edb80b 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -361,6 +361,9 @@ int bootm_decomp_image(int comp, ulong load, ulong image_start, int type, { int ret = 0; + if (!unc_len) + unc_len = CONFIG_SYS_BOOTM_LEN; + *load_end = load; print_decomp_msg(comp, type, load == image_start); @@ -373,10 +376,7 @@ int bootm_decomp_image(int comp, ulong load, ulong image_start, int type, case IH_COMP_NONE: if (load == image_start) break; - if (image_len <= unc_len) - memmove_wd(load_buf, image_buf, image_len, CHUNKSZ); - else - ret = 1; + memmove_wd(load_buf, image_buf, image_len, CHUNKSZ); break; #ifdef CONFIG_GZIP case IH_COMP_GZIP: { diff --git a/common/image-fit.c b/common/image-fit.c index 8d39a243f8..030f0098c7 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -23,6 +23,7 @@ DECLARE_GLOBAL_DATA_PTR; #endif /* !USE_HOSTCC*/ #include <image.h> +#include <bootm.h> #include <bootstage.h> #include <u-boot/crc.h> #include <u-boot/md5.h> @@ -1969,8 +1970,9 @@ int fit_image_load(bootm_headers_t *images, ulong addr, } } else if (load_op != FIT_LOAD_OPTIONAL_NON_ZERO || load) { ulong image_start, image_end; - ulong load_end; + ulong load_end, uncomp_len; void *dst; + u8 image_comp; /* * move image data to the load address, @@ -1986,11 +1988,22 @@ int fit_image_load(bootm_headers_t *images, ulong addr, return -EXDEV; } + if (fit_image_get_comp(fit, noffset, &image_comp)) { + puts("Can't get image compression!\n"); + return -EINVAL; + } printf(" Loading %s from 0x%08lx to 0x%08lx\n", prop_name, data, load); dst = map_sysmem(load, len); - memmove(dst, buf, len); + ret = bootm_decomp_image(image_comp, load, image_start, + image_type, dst, (void *)buf, len, 0, + &load_end); + if (ret) { + bootstage_error(BOOTSTAGE_ID_DECOMP_IMAGE); + return ret; + } + len = load_end - load; data = load; } bootstage_mark(bootstage_id + BOOTSTAGE_SUB_LOAD); -- 2.17.1

3 10