February 2018 - U-Boot

[U-Boot] U-Boot 2011.09, Kernel 3.0.30, Buildroot (rootfs) 2011.11 multi-image boot issue
by Eldor Rødseth 26 Feb '18

26 Feb '18

All, I am having an issue getting a multi-image to boot on my PPC MPC8308-based board. I am using U-Boot 2011.09 Kernel 3.0.30 Buildroot (rootfs) 2011.11 Using the mkimage tool I have composed a multi-image containing kernel, ramdisk(rootfs), and DTB using the following parameters: mkimage -A ppc -O linux -T multi -a 0x8000 -e 0x8000 -C gzip -n "MX Image" -d zImage.gz:rootfs.ext2.lzma:my.dtb mxImage The mxImage is programmed to my (NOR)flash at address 0xfc000000, and attempted started using the bootm-command in U-Boot as follows: >> bootm 0xfc000000 After some initialization/loading the board seem to “hang” somewhere along the point where U-Boot hands-over control to the kernel. The following is a snapshot of the boot-result: MPC8308=> bootm 0xfc000000 ## Booting kernel from Legacy Image at fc000000 ... Image Name: MX Image Image Type: PowerPC Linux Multi-File Image (gzip compressed) Data Size: 3663880 Bytes = 3.5 MiB Load Address: 00008000 Entry Point: 00008000 Contents: Image 0: 1607257 Bytes = 1.5 MiB Image 1: 2050371 Bytes = 2 MiB Image 2: 6232 Bytes = 6.1 KiB Verifying Checksum ... OK ## Loading init Ramdisk from multi component Legacy Image at fc000000 ... ## Flattened Device Tree from multi component Image at FC000000 Booting using the fdt at 0xfc37cff0 Uncompressing Multi-File Image ... OK Loading Ramdisk to 0fd43000, end 0ff37943 ... OK Loading Device Tree to 0fd3e000, end 0fd42857 ... OK ………….board hangs, and must be manually reboot’ed. Worth mentioning, perhaps, is that if I program the kernel, rootfs, and DTB separately and specify the bootm-command with the three unique addresses; i.e. >> bootm <kernel addr> <ramdisk addr> <DTB addr> then the board boot-up is successful. I would like to start using the multi-image principle to reduce number of MTD-partitions and hence get a more optimized use of the flash. I have previous experience with the multi-image principle from a Cortex A9 ARM design (although with more recent U-Boot, kernel, and Buildroot versions) and have tried to do the MPC8308 along the same lines – without success so far. Appreciate any ideas. Regards, Eldor

1 0

[U-Boot] [PATCH v4 00/12] Add new OPTEE bootm support to u-boot
by Bryan O'Donoghue 26 Feb '18

26 Feb '18

v4: - New type "optee" renamed to "tee-bootable". We discussed making the namespace here more logical and obvious in another thread. Kever may or may not end up adding "tee-combo". This patchset will result in "tee" and "tee-bootable" being valid names. Since "tee" is an existing image type the name will be maintained. - Tom - Added doc/README.trusted-execution-environment This gives a brief introduction on TEE plus some links to the spec and the op-tee website. In then lays out the difference between these two types "tee" (tee-standalone) "tee-bootable" - Bryan, Philipp - Small change made to comment on existing TEE - Bryan - Reworded the Kconfig option "OPTEE" Makes a little bit more sense to me re-reading now - Bryan - Add patch to define CONFIG_OPTEE_LOAD_ADDR An upcoming set of patches for a board will make use of this define in an OPTEE context. v3: - Rework printout to be added at the end as opposed to churn over three separate patches - Andrew - Reword patch 006 to better explain the thinking behind new image type - Andrew v2: - Added CONFIG_OPTEE_TZDRAM_BASE instead of #ifndef OPTEE_TZDRAM_BASE as an error. - Tom Rini - Added Tested-by: Peng Fan <peng.fan(a)nxp.com> - as indicated - Added better explanation text to patch 6/9 "tools: mkimage: add optee image type" - Fixed some checkpatch warnings in optee.c v1: This series adds a new OPTEE bootable image type to u-boot, which is directly bootable with the bootm command. There is already a TEE image type but, in this case the TEE firmware is loaded into RAM, jumped into and then back out of. This image type is a directly bootable image as described here : http://mrvan.github.io/optee-imx6ul Instead of reusing the Linux bootable image type instead a new image type is defined, which allows us to perform additional image verification, prior to handing off control via bootm. OPTEE images get linked to a specific address at compile time and must be loaded to this address too. This series extends out mkimage with a new image type that allows the OPTEE binary link location to be validated against CONFIG_OPTEE_TZDRAM_BASE and CONFIG_OPTEE_TZDRAM_SIZE respectively prior to proceeding through the bootm phase. Once applied you can generate a bootable OPTEE image like this mkimage -A arm -T optee -C none -d ./out/arm-plat-imx/core/tee.bin uTee.optee That image can then be booted directly by bootm. bootm will verify the header contents of the OPTEE binary against the DRAM area carved out in u-boot. If the defined DRAM area does not match the link address specified we refuse to boot. Kever - I'd like to suggest that your OPTEE SPL image takes a different image type IH_TYPE_OPTEE_SPL ? to indicate the different behavior your image type has versus a directly bootable bootm image. Bryan O'Donoghue (12): optee: Add lib entries for sharing OPTEE code across ports optee: Add CONFIG_OPTEE_TZDRAM_SIZE optee: Add CONFIG_OPTEE_TZDRAM_BASE optee: Add optee_image_get_entry_point() optee: Add optee_image_get_load_addr() image: Update comment for IH_TYPE_TEE tools: mkimage: add tee-bootable image type doc: TEE: Add documentation describing TEE in u-boot optee: Add optee_verify_bootm_image() optee: Add error printout bootm: optee: Add mechanism to validate a bootable TEE image optee: Add CONFIG_OPTEE_LOAD_ADDR common/bootm.c | 11 ++- common/image.c | 1 + doc/README.trusted-execution-environment | 123 +++++++++++++++++++++++++++++++ include/image.h | 3 +- include/tee/optee.h | 41 +++++++++++ lib/Kconfig | 1 + lib/Makefile | 1 + lib/optee/Kconfig | 29 ++++++++ lib/optee/Makefile | 7 ++ lib/optee/optee.c | 66 +++++++++++++++++ tools/default_image.c | 25 +++++-- 11 files changed, 300 insertions(+), 8 deletions(-) create mode 100644 doc/README.trusted-execution-environment create mode 100644 lib/optee/Kconfig create mode 100644 lib/optee/Makefile create mode 100644 lib/optee/optee.c -- 2.7.4

4 21

[U-Boot] [PATCH v1 0/5] Provide SPL support for bootcount (in the case of using falcon boot mode)
by Lukasz Majewski 26 Feb '18

26 Feb '18

This patch series provides support for controlling bootcount limits in SPL. It also enables this feature on display5 board to present usage patterns. This patch is probably eligible for -next u-boot release (after v2018.03). This patch has been applied on top of u-boot/master: SHA1: 85447f785ce8c0ab8e40850dc457a1fc833d224f Lukasz Majewski (5): bootcount: spl: Enable bootcount support in SPL bootcount: Add function wrappers to handle bootcount increment and error checking bootcount: u-boot: Do not increment bootcount if already done in SPL bootcount: display5: spl: Extend SPL to support bootcount checking bootcount: display5: config: Enable boot count feature in the display5 board board/liebherr/display5/spl.c | 6 +++++- common/autoboot.c | 2 ++ common/spl/Kconfig | 9 +++++++++ configs/display5_defconfig | 4 ++++ drivers/Makefile | 1 + include/bootcount.h | 25 +++++++++++++++++++++++++ 6 files changed, 46 insertions(+), 1 deletion(-) -- 2.11.0

3 15

[U-Boot] [GIT PULL ] Please pull u-boot-mmc master
by Jaehoon Chung 26 Feb '18

26 Feb '18

Dear Tom, Could you pull these patches to u-boot/master? The following changes since commit f0f6917188ad660cf002c10095f46ecf748b8f58: Prepare v2018.03-rc3 (2018-02-20 16:51:56 -0500) are available in the Git repository at: git://git.denx.de/u-boot-mmc.git master for you to fetch changes up to beac7d33d9131d22ffbdbfbf2786858062b63786: mmc: omap_hsmmc: use a default 52MHz max clock rate if none is specified (2018-02-26 10:52:15 +0900) ---------------------------------------------------------------- Alexander Kochetkov (1): mmc: fix off-by-one bug in mmc_startup_v4() Faiz Abbas (1): mmc: Drop unnecessary case for mmc_probe() Jaehoon Chung (1): mmc: synchronize the sequence with enum bus_mode in mmc.h Jean-Jacques Hiblot (4): mmc: omap_hsmmc: do not embed struct mmc in struct omap_hsmmc_plat mmc: omap_hsmmc: compile out write support if not needed mmc: omap_hsmmc: make it possible to compile out ADMA support mmc: omap_hsmmc: use a default 52MHz max clock rate if none is specified arch/arm/include/asm/omap_mmc.h | 2 +- drivers/mmc/Kconfig | 9 +++++++++ drivers/mmc/mmc.c | 20 +++++--------------- drivers/mmc/omap_hsmmc.c | 31 ++++++++++++++++++++----------- 4 files changed, 35 insertions(+), 27 deletions(-) Best Regards, Jaehoon Chung

2 1

[U-Boot] [RFC PATCH] Kconfig: cmd: Make networking command dependent on NET
by Michal Simek 26 Feb '18

26 Feb '18

Enable networking command only when NET is enabled. And remove selecting NET for CMD_NET Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- There is a huge impact on defconfigs because of select NET. But this change makes sense to do but it just needs to be syncup properly. Do we have a tool for this kind of change? --- cmd/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 790c40456de5..aedfd03c68ef 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -970,9 +970,10 @@ endmenu menu "Network commands" +if NET + config CMD_NET bool "bootp, tftpboot" - select NET default y help Network commands. @@ -1049,6 +1050,8 @@ config CMD_ETHSW operations such as enabling / disabling a port and viewing/maintaining the filtering database (FDB) +endif + endmenu menu "Misc commands" -- 1.9.1

2 2

[U-Boot] [PATCH] rockchip: i2c: enable I2C inside GRF for rk3066 and rk3188
by Alexander Kochetkov 26 Feb '18

26 Feb '18

In order to make I2C work on rk3066 and rk3188 boards GFR must be updated. Signed-off-by: Alexander Kochetkov <al.kochet(a)gmail.com> --- drivers/i2c/rk_i2c.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 80 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c index 332280c..3ec5474 100644 --- a/drivers/i2c/rk_i2c.c +++ b/drivers/i2c/rk_i2c.c @@ -12,6 +12,7 @@ #include <dm.h> #include <errno.h> #include <i2c.h> +#include <syscon.h> #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/i2c.h> @@ -34,6 +35,13 @@ struct rk_i2c { unsigned int speed; }; +/** + * @grf_offset: offset inside the grf regmap for setting the i2c type + */ +struct rk_i2c_soc_data { + int grf_offset; +}; + static inline void rk_i2c_get_div(int div, int *divh, int *divl) { *divl = div / 2; @@ -381,9 +389,37 @@ static int rockchip_i2c_ofdata_to_platdata(struct udevice *bus) static int rockchip_i2c_probe(struct udevice *bus) { struct rk_i2c *priv = dev_get_priv(bus); + struct rk_i2c_soc_data *soc_data; + uint32_t value; + int bus_nr; + void *grf; + int ret; priv->regs = dev_read_addr_ptr(bus); + soc_data = (struct rk_i2c_soc_data*)dev_get_driver_data(bus); + + if (soc_data->grf_offset >= 0) { + grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); + if (IS_ERR(grf)) { + ret = PTR_ERR(grf); + debug("%s: Could not get syscon for %s: %d\n", + __func__, bus->name, ret); + return ret; + } + + ret = dev_read_alias_seq(bus, &bus_nr); + if (ret < 0) { + debug("%s: Could not get alias for %s: %d\n", + __func__, bus->name, ret); + return ret; + } + + /* 27+i: write mask, 11+i: value */ + value = BIT(27 + bus_nr) | BIT(11 + bus_nr); + writel(value, grf + soc_data->grf_offset); + } + return 0; } @@ -392,12 +428,51 @@ static const struct dm_i2c_ops rockchip_i2c_ops = { .set_bus_speed = rockchip_i2c_set_bus_speed, }; +static const struct rk_i2c_soc_data rk3066_soc_data = { + .grf_offset = 0x154, +}; + +static const struct rk_i2c_soc_data rk3188_soc_data = { + .grf_offset = 0x0a4, +}; + +static const struct rk_i2c_soc_data rk3228_soc_data = { + .grf_offset = -1, +}; + +static const struct rk_i2c_soc_data rk3288_soc_data = { + .grf_offset = -1, +}; + +static const struct rk_i2c_soc_data rk3328_soc_data = { + .grf_offset = -1, +}; + +static const struct rk_i2c_soc_data rk3399_soc_data = { + .grf_offset = -1, +}; + static const struct udevice_id rockchip_i2c_ids[] = { - { .compatible = "rockchip,rk3066-i2c" }, - { .compatible = "rockchip,rk3188-i2c" }, - { .compatible = "rockchip,rk3288-i2c" }, - { .compatible = "rockchip,rk3328-i2c" }, - { .compatible = "rockchip,rk3399-i2c" }, + { + .compatible = "rockchip,rk3066-i2c", + .data = (ulong)&rk3066_soc_data, + }, + { + .compatible = "rockchip,rk3188-i2c", + .data = (ulong)&rk3188_soc_data, + }, + { + .compatible = "rockchip,rk3288-i2c", + .data = (ulong)&rk3288_soc_data, + }, + { + .compatible = "rockchip,rk3328-i2c", + .data = (ulong)&rk3328_soc_data, + }, + { + .compatible = "rockchip,rk3399-i2c", + .data = (ulong)&rk3399_soc_data, + }, { } }; -- 1.7.9.5

2 7

[U-Boot] [PATCH 1/2] arm: zynq: Setup the same bootcommand as for zc770 xm011 x8
by Michal Simek 26 Feb '18

26 Feb '18

The same command should be used for x16 configuration. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/zynq_zc770_xm011_x16_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynq_zc770_xm011_x16_defconfig b/configs/zynq_zc770_xm011_x16_defconfig index 8018831074e1..45124af530f7 100644 --- a/configs/zynq_zc770_xm011_x16_defconfig +++ b/configs/zynq_zc770_xm011_x16_defconfig @@ -10,7 +10,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOOTCOMMAND="run $modeboot || run distro_bootcmd" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_STACK_R=y -- 1.9.1

1 1

[U-Boot] [PATCH v2] arm64: zynqmp: Changed scratch address used by the alternate memory test
by Michal Simek 26 Feb '18

26 Feb '18

From: Vipul Kumar <vipul.kumar(a)xilinx.com> This patch changed CONFIG_SYS_MEMTEST_SCRATCH address to the accessible DDR address used by alternate memory test. Before this, 0xfffc0000 address was used, which is the OCM address and not enabled in MMU table. So, whenever trying to access 0xfffc0000 address, got Synchronous Abort exception. After changing CONFIG_SYS_MEMTEST_SCRATCH address, alternate memory test is working fine. Signed-off-by: Vipul Kumar <vipulk(a)xilinx.com> Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - Use ddr address only when u-boot runs out of DDR. Use OCM for mini configurations. include/configs/xilinx_zynqmp.h | 4 +++- include/configs/xilinx_zynqmp_mini.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 52baa42a2f11..2981aa50e7f2 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -21,7 +21,9 @@ #define GICC_BASE 0xF9020000 #define CONFIG_SYS_ALT_MEMTEST -#define CONFIG_SYS_MEMTEST_SCRATCH 0xfffc0000 +#ifndef CONFIG_SYS_MEMTEST_SCRATCH +# define CONFIG_SYS_MEMTEST_SCRATCH 0x10800000 +#endif #ifndef CONFIG_NR_DRAM_BANKS # define CONFIG_NR_DRAM_BANKS 2 diff --git a/include/configs/xilinx_zynqmp_mini.h b/include/configs/xilinx_zynqmp_mini.h index 00f4c1c087b0..4fbf85a9edc3 100644 --- a/include/configs/xilinx_zynqmp_mini.h +++ b/include/configs/xilinx_zynqmp_mini.h @@ -11,6 +11,8 @@ #ifndef __CONFIG_ZYNQMP_MINI_H #define __CONFIG_ZYNQMP_MINI_H +#define CONFIG_SYS_MEMTEST_SCRATCH 0xfffc0000 + #include <configs/xilinx_zynqmp.h> /* Undef unneeded configs */ -- 1.9.1

1 0

[U-Boot] [PATCH] sunxi: video: lcdc: fix HSYNC and VSYNC polarity
by Giulio Benetti 26 Feb '18

26 Feb '18

Differently from other Lcd signals, HSYNC and VSYNC signals result inverted if their bits are cleared to 0. Invert their settings of IO_POL register. Signed-off-by: Giulio Benetti <giulio.benetti(a)micronovasrl.com> --- drivers/video/sunxi/lcdc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/sunxi/lcdc.c b/drivers/video/sunxi/lcdc.c index 4cb86fb..007057c 100644 --- a/drivers/video/sunxi/lcdc.c +++ b/drivers/video/sunxi/lcdc.c @@ -132,9 +132,9 @@ void lcdc_tcon0_mode_set(struct sunxi_lcdc_reg * const lcdc, } val = SUNXI_LCDC_TCON0_IO_POL_DCLK_PHASE(dclk_phase); - if (mode->flags & DISPLAY_FLAGS_HSYNC_LOW) + if (mode->flags & DISPLAY_FLAGS_HSYNC_HIGH) val |= SUNXI_LCDC_TCON_HSYNC_MASK; - if (mode->flags & DISPLAY_FLAGS_VSYNC_LOW) + if (mode->flags & DISPLAY_FLAGS_VSYNC_HIGH) val |= SUNXI_LCDC_TCON_VSYNC_MASK; #ifdef CONFIG_VIDEO_VGA_VIA_LCD_FORCE_SYNC_ACTIVE_HIGH -- 2.7.4

3 3

[U-Boot] [PATCH] SPL: Add signature verification when loading image
by Jun Nie 26 Feb '18

26 Feb '18

Add signature verification when loading FIT image in SPL. Signed-off-by: Jun Nie <jun.nie(a)linaro.org> --- common/image-fit.c | 56 +++++++++++++++++++++++++++++++--------------------- common/spl/spl_fit.c | 12 +++++++++++ include/image.h | 2 ++ 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/common/image-fit.c b/common/image-fit.c index f6e956a..94d9d4b 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1068,34 +1068,14 @@ static int fit_image_check_hash(const void *fit, int noffset, const void *data, return 0; } -/** - * fit_image_verify - verify data integrity - * @fit: pointer to the FIT format image header - * @image_noffset: component image node offset - * - * fit_image_verify() goes over component image hash nodes, - * re-calculates each data hash and compares with the value stored in hash - * node. - * - * returns: - * 1, if all hashes are valid - * 0, otherwise (or on error) - */ -int fit_image_verify(const void *fit, int image_noffset) +int fit_image_verify_with_data(const void *fit, int image_noffset, + const void *data, size_t size) { - const void *data; - size_t size; int noffset = 0; char *err_msg = ""; int verify_all = 1; int ret; - /* Get image data and data length */ - if (fit_image_get_data(fit, image_noffset, &data, &size)) { - err_msg = "Can't get image data/size"; - goto error; - } - /* Verify all required signatures */ if (IMAGE_ENABLE_VERIFY && fit_image_verify_required_sigs(fit, image_noffset, data, size, @@ -1153,6 +1133,38 @@ error: } /** + * fit_image_verify - verify data integrity + * @fit: pointer to the FIT format image header + * @image_noffset: component image node offset + * + * fit_image_verify() goes over component image hash nodes, + * re-calculates each data hash and compares with the value stored in hash + * node. + * + * returns: + * 1, if all hashes are valid + * 0, otherwise (or on error) + */ +int fit_image_verify(const void *fit, int image_noffset) +{ + const void *data; + size_t size; + int noffset = 0; + char *err_msg = ""; + + /* Get image data and data length */ + if (fit_image_get_data(fit, image_noffset, &data, &size)) { + err_msg = "Can't get image data/size"; + printf("error!\n%s for '%s' hash node in '%s' image node\n", + err_msg, fit_get_name(fit, noffset, NULL), + fit_get_name(fit, image_noffset, NULL)); + return 0; + } + + return fit_image_verify_with_data(fit, image_noffset, data, size); +} + +/** * fit_all_image_verify - verify data integrity for all images * @fit: pointer to the FIT format image header * diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index cc07fbc..8d382eb 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -174,6 +174,9 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector, uint8_t image_comp = -1, type = -1; const void *data; bool external_data = false; +#ifdef CONFIG_SPL_FIT_SIGNATURE + int ret; +#endif if (IS_ENABLED(CONFIG_SPL_OS_BOOT) && IS_ENABLED(CONFIG_SPL_GZIP)) { if (fit_image_get_comp(fit, node, &image_comp)) @@ -252,7 +255,16 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector, image_info->entry_point = fdt_getprop_u32(fit, node, "entry"); } +#ifdef CONFIG_SPL_FIT_SIGNATURE + printf("## Checking hash(es) for Image %s ...\n", + fit_get_name(fit, node, NULL)); + ret = fit_image_verify_with_data(fit, node, + (const void *)load_addr, length); + printf("\n"); + return !ret; +#else return 0; +#endif } static int spl_fit_append_fdt(struct spl_image_info *spl_image, diff --git a/include/image.h b/include/image.h index 325b014..77c11f8 100644 --- a/include/image.h +++ b/include/image.h @@ -1013,6 +1013,8 @@ int fit_add_verification_data(const char *keydir, void *keydest, void *fit, const char *comment, int require_keys, const char *engine_id); +int fit_image_verify_with_data(const void *fit, int image_noffset, + const void *data, size_t size); int fit_image_verify(const void *fit, int noffset); int fit_config_verify(const void *fit, int conf_noffset); int fit_all_image_verify(const void *fit); -- 1.9.1

2 5