April 2021 - U-Boot

[PATCH] power: regulator: Add support for regulator-force-boot-off
by Stefan Roese 10 Apr '21

10 Apr '21

From: Konstantin Porotchkin <kostap(a)marvell.com> Add support for regulator-force-boot-off DT property. This property can be used by the board/device drivers for turning off regulators on early init stages as pre-requisite for the other components initialization. Signed-off-by: Konstantin Porotchkin <kostap(a)marvell.com> Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Jaehoon Chung <jh80.chung(a)samsung.com> Cc: Simon Glass <sjg(a)chromium.org> --- drivers/power/regulator/regulator-uclass.c | 38 ++++++++++++++++++++++ include/power/regulator.h | 23 +++++++++++++ 2 files changed, 61 insertions(+) diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c index 4d2e730271f9..423867edced8 100644 --- a/drivers/power/regulator/regulator-uclass.c +++ b/drivers/power/regulator/regulator-uclass.c @@ -311,6 +311,17 @@ int regulator_autoset(struct udevice *dev) return ret; } +int regulator_unset(struct udevice *dev) +{ + struct dm_regulator_uclass_plat *uc_pdata; + + uc_pdata = dev_get_uclass_plat(dev); + if (uc_pdata->force_off) + return regulator_set_enable(dev, false); + + return -EMEDIUMTYPE; +} + static void regulator_show(struct udevice *dev, int ret) { struct dm_regulator_uclass_plat *uc_pdata; @@ -443,6 +454,7 @@ static int regulator_pre_probe(struct udevice *dev) uc_pdata->boot_on = dev_read_bool(dev, "regulator-boot-on"); uc_pdata->ramp_delay = dev_read_u32_default(dev, "regulator-ramp-delay", 0); + uc_pdata->force_off = dev_read_bool(dev, "regulator-force-boot-off"); node = dev_read_subnode(dev, "regulator-state-mem"); if (ofnode_valid(node)) { @@ -495,6 +507,32 @@ int regulators_enable_boot_on(bool verbose) return ret; } +int regulators_enable_boot_off(bool verbose) +{ + struct udevice *dev; + struct uclass *uc; + int ret; + + ret = uclass_get(UCLASS_REGULATOR, &uc); + if (ret) + return ret; + for (uclass_first_device(UCLASS_REGULATOR, &dev); + dev; + uclass_next_device(&dev)) { + ret = regulator_unset(dev); + if (ret == -EMEDIUMTYPE) { + ret = 0; + continue; + } + if (verbose) + regulator_show(dev, ret); + if (ret == -ENOSYS) + ret = 0; + } + + return ret; +} + UCLASS_DRIVER(regulator) = { .id = UCLASS_REGULATOR, .name = "regulator", diff --git a/include/power/regulator.h b/include/power/regulator.h index da9a065bdde0..fad87c99e5db 100644 --- a/include/power/regulator.h +++ b/include/power/regulator.h @@ -151,6 +151,7 @@ enum regulator_flag { * @max_uA* - maximum amperage (micro Amps) * @always_on* - bool type, true or false * @boot_on* - bool type, true or false + * @force_off* - bool type, true or false * TODO(sjg(a)chromium.org): Consider putting the above two into @flags * @ramp_delay - Time to settle down after voltage change (unit: uV/us) * @flags: - flags value (see REGULATOR_FLAG_...) @@ -176,6 +177,7 @@ struct dm_regulator_uclass_plat { unsigned int ramp_delay; bool always_on; bool boot_on; + bool force_off; const char *name; int flags; u8 ctrl_reg; @@ -420,6 +422,15 @@ int regulator_set_mode(struct udevice *dev, int mode_id); */ int regulators_enable_boot_on(bool verbose); +/** + * regulators_enable_boot_off() - disable regulators needed for boot + * + * This disables all regulators which are marked to be off at boot time. + * + * This effectively calls regulator_unset() for every regulator. + */ +int regulators_enable_boot_off(bool verbose); + /** * regulator_autoset: setup the voltage/current on a regulator * @@ -439,6 +450,18 @@ int regulators_enable_boot_on(bool verbose); */ int regulator_autoset(struct udevice *dev); +/** + * regulator_unset: turn off a regulator + * + * The setup depends on constraints found in device's uclass's platform data + * (struct dm_regulator_uclass_platdata): + * + * - Disable - will set - if 'force_off' is set to true, + * + * The function returns on the first-encountered error. + */ +int regulator_unset(struct udevice *dev); + /** * regulator_autoset_by_name: setup the regulator given by its uclass's * platform data name field. The setup depends on constraints found in device's -- 2.31.1

2 5

[PATCH v2] cmd: net: Add the "arp" command
by lgxue＠hotmail.com 10 Apr '21

10 Apr '21

From: Joe Xue <lgxue(a)hotmail.com> The command is to query and show mac address of a specific ipAddress. Signed-off-by: Joe Xue <lgxue(a)hotmail.com> --- cmd/Kconfig | 6 ++++++ cmd/net.c | 36 ++++++++++++++++++++++++++++++++++++ doc/usage/arp.rst | 31 +++++++++++++++++++++++++++++++ include/net.h | 5 +++++ net/arp.c | 24 ++++++++++++++++++++++++ net/arp.h | 4 ++++ net/net.c | 8 ++++++++ 7 files changed, 114 insertions(+) create mode 100644 doc/usage/arp.rst diff --git a/cmd/Kconfig b/cmd/Kconfig index 9bf5e863e4..1da4cb67f6 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1587,6 +1587,12 @@ config CMD_PING help Send ICMP ECHO_REQUEST to network host +config CMD_ARP + bool "arp" + help + Sends ARP_REQUEST to network host and shows the result if there is arp + response. + config CMD_CDP bool "cdp" help diff --git a/cmd/net.c b/cmd/net.c index beb2877dfd..369d15474c 100644 --- a/cmd/net.c +++ b/cmd/net.c @@ -479,4 +479,40 @@ U_BOOT_CMD( "" ); +#ifdef CONFIG_CMD_ARP +static int do_arp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) +{ + u8 *ethaddr = arp_query_ethaddr; + + if (argc < 2) + return CMD_RET_USAGE; + + arp_query_ip = string_to_ip(argv[1]); + if (arp_query_ip.s_addr == 0) + return CMD_RET_USAGE; + + if ((arp_query_ip.s_addr & net_netmask.s_addr) != + (net_ip.s_addr & net_netmask.s_addr)) { + printf("The host %s is not in the same network\n", argv[1]); + return CMD_RET_SUCCESS; + } + + if (net_loop(ARP) < 0) { + printf("arp failed; host %s is not alive\n", argv[1]); + return CMD_RET_FAILURE; + } + + printf("%s\t%02x:%02x:%02x:%02x:%02x:%02x\n", argv[1], ethaddr[0], + ethaddr[1], ethaddr[2], ethaddr[3], ethaddr[4], ethaddr[5]); + + return CMD_RET_SUCCESS; +} + +U_BOOT_CMD( + arp, 2, 1, do_arp, + "send ARP ARP_REQUEST to network host", + "ipAddress" +); +#endif + #endif /* CONFIG_CMD_LINK_LOCAL */ diff --git a/doc/usage/arp.rst b/doc/usage/arp.rst new file mode 100644 index 0000000000..b1f08a2ae9 --- /dev/null +++ b/doc/usage/arp.rst @@ -0,0 +1,31 @@ +arp command +=========== + +Synopis +------- + +:: + + arp ipAddress + +Description +----------- + +The arp command is used to send ARP_REQUEST to network host and show the result. + +ipAddress + the host ip address + +Example +------- + +:: + + => arp 192.168.0.1 + Using host_ens33 device + 192.168.0.1 84:94:8c:5f:e1:62 + +Return value +------------ + +The return value $? is 0 if the comand running was successful else 1 diff --git a/include/net.h b/include/net.h index b95d6a6f60..60b4bf610e 100644 --- a/include/net.h +++ b/include/net.h @@ -580,6 +580,11 @@ extern char *net_dns_env_var; /* the env var to put the ip into */ extern struct in_addr net_ping_ip; /* the ip address to ping */ #endif +#if defined(CONFIG_CMD_ARP) +extern u8 arp_query_ethaddr[6]; /* the arp query result */ +extern struct in_addr arp_query_ip; /* the ip address to arp query */ +#endif + #if defined(CONFIG_CMD_CDP) /* when CDP completes these hold the return values */ extern ushort cdp_native_vlan; /* CDP returned native VLAN */ diff --git a/net/arp.c b/net/arp.c index 1d06ed2572..83c24072d7 100644 --- a/net/arp.c +++ b/net/arp.c @@ -220,11 +220,20 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) net_get_arp_handler()((uchar *)arp, 0, reply_ip_addr, 0, len); +#ifdef CONFIG_CMD_ARP + if (arp_query_ip.s_addr != 0) { + arp_query_ip.s_addr = 0; + net_set_state(NETLOOP_SUCCESS); + } else { +#endif /* set the mac address in the waiting packet's header and transmit it */ memcpy(((struct ethernet_hdr *)net_tx_packet)->et_dest, &arp->ar_sha, ARP_HLEN); net_send_packet(net_tx_packet, arp_wait_tx_packet_size); +#ifdef CONFIG_CMD_ARP + } +#endif /* no arp request pending now */ net_arp_wait_packet_ip.s_addr = 0; @@ -243,3 +252,18 @@ bool arp_is_waiting(void) { return !!net_arp_wait_packet_ip.s_addr; } + +#ifdef CONFIG_CMD_ARP +u8 arp_query_ethaddr[6]; +struct in_addr arp_query_ip; + +void arp_query(void) +{ + arp_wait_packet_ethaddr = arp_query_ethaddr; + net_arp_wait_packet_ip = arp_query_ip; + + arp_wait_timer_start = get_timer(0); + printf("Using %s device\n", eth_get_name()); + arp_request(); +} +#endif diff --git a/net/arp.h b/net/arp.h index 25b3c00d5c..f3e5cb8504 100644 --- a/net/arp.h +++ b/net/arp.h @@ -29,4 +29,8 @@ void arp_raw_request(struct in_addr source_ip, const uchar *targetEther, int arp_timeout_check(void); void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len); +#ifdef CONFIG_CMD_ARP +void arp_query(void); +#endif + #endif /* __ARP_H__ */ diff --git a/net/net.c b/net/net.c index b58f3062b2..21623562e8 100644 --- a/net/net.c +++ b/net/net.c @@ -492,6 +492,11 @@ restart: rarp_request(); break; #endif +#if defined(CONFIG_CMD_ARP) + case ARP: + arp_query(); + break; +#endif #if defined(CONFIG_CMD_PING) case PING: ping_start(); @@ -1385,6 +1390,9 @@ common: case CDP: case DHCP: case LINKLOCAL: +#ifdef CONFIG_CMD_ARP + case ARP: +#endif if (memcmp(net_ethaddr, "\0\0\0\0\0\0", 6) == 0) { int num = eth_get_dev_index(); -- 2.27.0

3 2

[PATCH 01/19] phy: nop-phy: Add standard usb-nop-xceiv compat string
by Marek Vasut 10 Apr '21

10 Apr '21

The USB no-op PHY uses "usb-nop-xceiv" compatible string. This driver is compatible with USB no-op PHY, so add the compatible string. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Alexey Brodkin <alexey.brodkin(a)synopsys.com> Cc: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Jean-Jacques Hiblot <jjhiblot(a)ti.com> Cc: Murali Karicheri <m-karicheri2(a)ti.com> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Ye Li <ye.li(a)nxp.com> Cc: uboot-imx <uboot-imx(a)nxp.com> --- drivers/phy/nop-phy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/phy/nop-phy.c b/drivers/phy/nop-phy.c index 84aac806230..9f12ebc0624 100644 --- a/drivers/phy/nop-phy.c +++ b/drivers/phy/nop-phy.c @@ -43,6 +43,7 @@ static int nop_phy_probe(struct udevice *dev) static const struct udevice_id nop_phy_ids[] = { { .compatible = "nop-phy" }, + { .compatible = "usb-nop-xceiv" }, { } }; -- 2.30.2

5 25

Re: [PATCH 06/11] imx: ventana: convert U-Boot to OF_CONTROL using FIT image
by Tim Harvey 10 Apr '21

10 Apr '21

On Thu, Apr 8, 2021 at 1:57 PM <sbabic(a)denx.de> wrote: > > > In preparation for dm conversion convert to OF_CONTROL by adding FIT image > > support and multi dtb. > > Add a board_fit_config_name_match to match the dtb based off of EEPROM > > model. > > Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> > Applied to u-boot-imx, master, thanks ! > > Best regards, > Stefano Babic > Stefano, Something broke apparently between the branch I had my patches on top of and u-boot-imx/master that these got merged in. My board is hanging at dram_init_banksize - did something change recently that you are aware of that may require some changes on my end? Thanks, Tim

2 4

[PATCH] cmd: net: Add the "arp" command
by lgxue＠hotmail.com 09 Apr '21

09 Apr '21

From: Joe Xue <lgxue(a)hotmail.com> The command is to query and show mac address of a specific ipAddress. Signed-off-by: Joe Xue <lgxue(a)hotmail.com> --- cmd/Kconfig | 6 ++++++ cmd/net.c | 36 ++++++++++++++++++++++++++++++++++++ include/net.h | 5 +++++ net/arp.c | 24 ++++++++++++++++++++++++ net/arp.h | 4 ++++ net/net.c | 8 ++++++++ 6 files changed, 83 insertions(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index 9bf5e863e4..1da4cb67f6 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1587,6 +1587,12 @@ config CMD_PING help Send ICMP ECHO_REQUEST to network host +config CMD_ARP + bool "arp" + help + Sends ARP_REQUEST to network host and shows the result if there is arp + response. + config CMD_CDP bool "cdp" help diff --git a/cmd/net.c b/cmd/net.c index beb2877dfd..369d15474c 100644 --- a/cmd/net.c +++ b/cmd/net.c @@ -479,4 +479,40 @@ U_BOOT_CMD( "" ); +#ifdef CONFIG_CMD_ARP +static int do_arp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) +{ + u8 *ethaddr = arp_query_ethaddr; + + if (argc < 2) + return CMD_RET_USAGE; + + arp_query_ip = string_to_ip(argv[1]); + if (arp_query_ip.s_addr == 0) + return CMD_RET_USAGE; + + if ((arp_query_ip.s_addr & net_netmask.s_addr) != + (net_ip.s_addr & net_netmask.s_addr)) { + printf("The host %s is not in the same network\n", argv[1]); + return CMD_RET_SUCCESS; + } + + if (net_loop(ARP) < 0) { + printf("arp failed; host %s is not alive\n", argv[1]); + return CMD_RET_FAILURE; + } + + printf("%s\t%02x:%02x:%02x:%02x:%02x:%02x\n", argv[1], ethaddr[0], + ethaddr[1], ethaddr[2], ethaddr[3], ethaddr[4], ethaddr[5]); + + return CMD_RET_SUCCESS; +} + +U_BOOT_CMD( + arp, 2, 1, do_arp, + "send ARP ARP_REQUEST to network host", + "ipAddress" +); +#endif + #endif /* CONFIG_CMD_LINK_LOCAL */ diff --git a/include/net.h b/include/net.h index b95d6a6f60..60b4bf610e 100644 --- a/include/net.h +++ b/include/net.h @@ -580,6 +580,11 @@ extern char *net_dns_env_var; /* the env var to put the ip into */ extern struct in_addr net_ping_ip; /* the ip address to ping */ #endif +#if defined(CONFIG_CMD_ARP) +extern u8 arp_query_ethaddr[6]; /* the arp query result */ +extern struct in_addr arp_query_ip; /* the ip address to arp query */ +#endif + #if defined(CONFIG_CMD_CDP) /* when CDP completes these hold the return values */ extern ushort cdp_native_vlan; /* CDP returned native VLAN */ diff --git a/net/arp.c b/net/arp.c index 1d06ed2572..83c24072d7 100644 --- a/net/arp.c +++ b/net/arp.c @@ -220,11 +220,20 @@ void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len) net_get_arp_handler()((uchar *)arp, 0, reply_ip_addr, 0, len); +#ifdef CONFIG_CMD_ARP + if (arp_query_ip.s_addr != 0) { + arp_query_ip.s_addr = 0; + net_set_state(NETLOOP_SUCCESS); + } else { +#endif /* set the mac address in the waiting packet's header and transmit it */ memcpy(((struct ethernet_hdr *)net_tx_packet)->et_dest, &arp->ar_sha, ARP_HLEN); net_send_packet(net_tx_packet, arp_wait_tx_packet_size); +#ifdef CONFIG_CMD_ARP + } +#endif /* no arp request pending now */ net_arp_wait_packet_ip.s_addr = 0; @@ -243,3 +252,18 @@ bool arp_is_waiting(void) { return !!net_arp_wait_packet_ip.s_addr; } + +#ifdef CONFIG_CMD_ARP +u8 arp_query_ethaddr[6]; +struct in_addr arp_query_ip; + +void arp_query(void) +{ + arp_wait_packet_ethaddr = arp_query_ethaddr; + net_arp_wait_packet_ip = arp_query_ip; + + arp_wait_timer_start = get_timer(0); + printf("Using %s device\n", eth_get_name()); + arp_request(); +} +#endif diff --git a/net/arp.h b/net/arp.h index 25b3c00d5c..f3e5cb8504 100644 --- a/net/arp.h +++ b/net/arp.h @@ -29,4 +29,8 @@ void arp_raw_request(struct in_addr source_ip, const uchar *targetEther, int arp_timeout_check(void); void arp_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len); +#ifdef CONFIG_CMD_ARP +void arp_query(void); +#endif + #endif /* __ARP_H__ */ diff --git a/net/net.c b/net/net.c index b58f3062b2..21623562e8 100644 --- a/net/net.c +++ b/net/net.c @@ -492,6 +492,11 @@ restart: rarp_request(); break; #endif +#if defined(CONFIG_CMD_ARP) + case ARP: + arp_query(); + break; +#endif #if defined(CONFIG_CMD_PING) case PING: ping_start(); @@ -1385,6 +1390,9 @@ common: case CDP: case DHCP: case LINKLOCAL: +#ifdef CONFIG_CMD_ARP + case ARP: +#endif if (memcmp(net_ethaddr, "\0\0\0\0\0\0", 6) == 0) { int num = eth_get_dev_index(); -- 2.27.0

2 1

mkimage regression when building ARCH=mips defconfig Linux kernel
by Nathan Chancellor 09 Apr '21

09 Apr '21

Hi Simon, Apologies if this is not the proper way to report a regression, this is my first time interacting with the U-Boot community. My distribution updated the uboot-tools package to 2021.04, which broke my Linux kernel builds for ARCH=mips: $ make -skj"$(nproc)" ARCH=mips CROSS_COMPILE=mips-linux- defconfig all ... /usr/bin/mkimage: verify_header failed for FIT Image support with exit code 1 make[2]: *** [arch/mips/boot/Makefile:173: arch/mips/boot/vmlinux.gz.itb] Error 1 ... I bisected this down to your commit: 3f04db891a353f4b127ed57279279f851c6b4917 is the first bad commit commit 3f04db891a353f4b127ed57279279f851c6b4917 Author: Simon Glass <sjg(a)chromium.org> Date: Mon Feb 15 17:08:12 2021 -0700 image: Check for unit addresses in FITs Using unit addresses in a FIT is a security risk. Add a check for this and disallow it. CVE-2021-27138 Signed-off-by: Simon Glass <sjg(a)chromium.org> Reported-by: Bruce Monroe <bruce.monroe(a)intel.com> Reported-by: Arie Haenel <arie.haenel(a)intel.com> Reported-by: Julien Lenoir <julien.lenoir(a)intel.com> common/image-fit.c | 56 +++++++++++++++++++++++++++++++++++++++++---- test/py/tests/test_vboot.py | 9 ++++---- 2 files changed, 57 insertions(+), 8 deletions(-) bisect run success $ git bisect log # bad: [e9c99db7787e3b5c2ef05701177c43ed1c023c27] Merge branch '2021-04-07-CI-improvements' # good: [c4fddedc48f336eabc4ce3f74940e6aa372de18c] Prepare v2021.01 git bisect start 'e9c99db7787e3b5c2ef05701177c43ed1c023c27' 'v2021.01' # good: [b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1] arm: dts: r8a774a1: Import DTS queued for Linux 5.12-rc1 git bisect good b2c86f596cfb1ea9f7f5138f72f1c5c49e3ae3f1 # bad: [74f4929c2c73beb595faf7d5d9bb6a78d710c2fd] ddr: marvell: axp: fix array types have different bounds warning git bisect bad 74f4929c2c73beb595faf7d5d9bb6a78d710c2fd # bad: [cbe607b920bc0827d8fe379ed4f5ae4e2058513e] Merge tag 'xilinx-for-v2021.04-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze git bisect bad cbe607b920bc0827d8fe379ed4f5ae4e2058513e # good: [d5f3aadacbc63df3b690d6fd9f0aa3f575b43356] test: Add tests for the 'evil' vboot attacks git bisect good d5f3aadacbc63df3b690d6fd9f0aa3f575b43356 # bad: [a1a652e8016426e2d67148cab225cd5ec45189fb] Merge tag 'mmc-2021-2-19' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc git bisect bad a1a652e8016426e2d67148cab225cd5ec45189fb # bad: [aeedeae40733131467de72c68e639cf9d795e059] spl: fit: Replace #ifdef blocks with more readable constructs git bisect bad aeedeae40733131467de72c68e639cf9d795e059 # bad: [eb5fd9e46c11ea41430d9c5bcc81d4583424216e] usb: kbd: destroy device after console is stopped git bisect bad eb5fd9e46c11ea41430d9c5bcc81d4583424216e # bad: [99cb2b996bd649d98069a95941beaaade0a4447a] stdio: Split out nulldev_register() and move it under #if git bisect bad 99cb2b996bd649d98069a95941beaaade0a4447a # bad: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs git bisect bad 3f04db891a353f4b127ed57279279f851c6b4917 # good: [6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01] image: Add an option to do a full check of the FIT git bisect good 6f3c2d8aa5e6cbd80b5e869bbbddecb66c329d01 # good: [124c255731c76a2b09587378b2bcce561bcd3f2d] libfdt: Check for multiple/invalid root nodes git bisect good 124c255731c76a2b09587378b2bcce561bcd3f2d # first bad commit: [3f04db891a353f4b127ed57279279f851c6b4917] image: Check for unit addresses in FITs Is this an actual regression or is this now the expected behavior? I have added Thomas and the linux-mips mailing list to take a look and see if the Linux kernel needs to have its sources updated. Cheers, Nathan

3 2

Pull request: u-boot-imx u-boot-imx-20210409
by Stefano Babic 09 Apr '21

09 Apr '21

Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit e9c99db7787e3b5c2ef05701177c43ed1c023c27: Merge branch '2021-04-07-CI-improvements' (2021-04-07 15:54:07 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-20210409 for you to fetch changes up to 2fc93e5bafdae7cf6373479e054e9f3943fde23c: imx: bootaux fix elf loading (2021-04-08 23:59:50 +0200) ---------------------------------------------------------------- u-boot-imx-20210409 ------------------- - Secure Boot : - HAB for MX8M / MX7ULP - CAAM fixes - Fixes for imxrt1020 - Fixes for USDHC driver - Fixes for Toradex (Colibri / Apalis) - Switch to DM for several boards - mx23 olinuxo - usbarmory - marsboard / riotboard - Gateworks GW Ventana - NXP upstream patches (LPDDR / CAAM / HAB) CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/7089 ---------------------------------------------------------------- Adam Ford (2): arm: dts: imx8mn, imx8mn-beacon: Sync dts files with Kernel 5.12-rc5 configs: imx8mn_beacon: Enable QSPI Support Aymen Sghaier (5): crypto: caam: Add CAAM support to i.MX8M platforms crypto: caam: Fix build warnings pointer casting crypto: Add blob command support for i.MX8M platforms crypto: caam: Fix pointer size to 32bit for i.MX8M crypto: caam: Add secure memory vid 3 support Breno Lima (13): imx: imx7 Support for Manufacturing Protection imx: Avoid hardcoded output ring size register offset (ORSR) imx: Ensure CAAM clock is enabled prior getting out_jr_size imx: Avoid hardcoded Job Ring Max size imx: hab: Enable hab.c to authenticate additional images in open configuration imx: hab: Check if IVT header is HABv4 mx7ulp: hab: Add hab_status command for HABv4 M4 boot imx: hab: Fix build warnings in 32-bit targets crypto: fsl: blob: Flush dcache range for destination address mx6dq: hab: Fix chip version in hab.h code cmd: blob: Add IMX_HAB and CAAM supported SoCs as dependency cmd: blob: Instantiate RNG before running CMD_BLOB fsl_mfgprot: Fix typo in sign_mppubk() Clement Faure (2): imx8m: Add DEK blob encapsulation for imx8m imx8: Add DEK blob encapsulation Clement Le Marquis (1): imx: caam: new u-boot command to set PRIBLOB bitfield from CAAM SCFGR register to 0x3 Fabio Estevam (2): MAINTAINERS: Use my personal e-mail address pico-imx6ul: Pass the PMIC I2C address in pmic_get() Franck LENORMAND (3): crypto: caam: change JR running loop caam: enable support for iMX7ULP imx7ulp: Enable support for cmd blob Giulio Benetti (3): board: freescale: imxrt1020-evk: fix console is not enabled while init dram board: freescale: imxrt1050-evk: fix console is not enabled while init dram board: st: stm32f746-disco: fix console is not enabled while init dram Haibo Chen (3): mmc: fsl_esdhc_imx: use VENDORSPEC_FRC_SDCLK_ON to control card clock output mmc: fsl_esdhc_imx: remove redundant cmd11 related code. mmc: fsl_esdhc_imx: add extra delay for IO voltage switch if necessary Heinrich Schuchardt (1): imx6: icorem6: chmod 644 enigcam.bmp Igor Opaniuk (1): colibri_imx6: adjust boot order Jacky Bai (1): imx8mn: Update the DDR4 timing script on imx8mn ddr4 evk Marek Vasut (2): ARM: imx: Add OCRAM_S into iMX8M MMU tables doc: imx: psb: Document usage of SRC_GPR10 PERSIST_SECONDARY_BOOT for A/B switching Max Krummenacher (1): imx: bootaux fix elf loading Niel Fourie (1): ARM: pcm058: Match mainline Linux NAND ECC layout/behaviour Oleksandr Suvorov (2): apalis/colibri_imx6: remove video= settings board: toradex: apalis-imx8x: fix build instructions Peng (1): imx8mn: evk: update MAINTAINERS Peng Fan (20): tools: imx image: fix write warning imx8mm/p: remove boot.cmd imx8mm_evk: add/cleanup variable for distro imx8mp_evk: add/cleanup variable for distro imx8mp_evk: spl: clean up including headers imx8mp_evk: Increase VDD_ARM to 0.95v Overdrive voltage power: pca9450: add a new parameter for power_pca9450_init imx8mn_evk: drop duplicated code imx8mn: Add LPDDR4 EVK board support imx8m: soc: update fuse path arch: mach-imx: imx8m: fix unique_id read error for imx8mp imx8m: add regs used by CAAM imx: HAB: Update hab codes to support ARM64 and i.MX8M imx8mm_evk: switch to use binman to pack images doc: imx8mm_evk: update doc after using binman imx8mn-ddr4-evk: switch to use binman imx8mn-evk: switch to use binman doc: imx8mn_evk: update doc after using binman imx8mp-evk: switch to use binman doc: imx8mp-evk: update after using binman Peter Robinson (15): ARM: board: usbarmory: Import the usbarmory dts file ARM: board: usbarmory: Convert to OF_CONTROL and DM ARM: embestmx6boards: Import the marsboard/riotboard. dts files ARM: marsboard: Enable OF_CONTROL and DM gpio/pin control ARM: embestmx6boards: merge the riotboard's configs together ARM: riotboard: Enable OF_CONTROL and DM gpio/pin control ARM: embestmx6boards: convert the mars/riot boards to DM_MMC ARM: embestmx6boards: convert mars/riot boards to DM_USB ARM: embestmx6boards: convert mars/riot boards to DM_ETH ARM: embestmx6boards: convert the mars/riot boards to DM SPI ARM: board: udoo: Import UDOO dts files ARM: imx: udoo: Enable OF_CONTROL and DM gpio/pin control ARM: imx: udoo: drop MTD config ARM: imx: udoo: Convert block devices to DM ARM: imx: udoo: convert to DM_ETH Philippe Schenker (1): colibri_imx6ull/imx7: add missing tdxargs variable Sherry Sun (1): imx8mp: ddr: Add inline ECC feature support Tim Harvey (13): spl: fit: nand: skip bad block handling if NAND chip not fully defined spl: fit: nand: allow for non-page-aligned elements dt-bindings: add tda1997x and bindings imx: ventana: add Gateworks Ventana dts arm: dts: imx6qdl-gw*: add dr_mode prop to dt to avoid error imx: ventana: convert U-Boot to OF_CONTROL using FIT image imx: ventana: add pinctrl and remove unneeded UART init and config imx: ventana: enable dm support for USB imx: ventana: enable dm support for MMC and SATA imx: ventana: enable dm for MTD and NAND imx: ventana: enable dm for SPI board: gateworks: venice: fix gsc_get_dev board: gateworks: venice: increase CONFIG_SYS_SPL_MALLOC_SIZE Trevor Woerner (2): mx23_olinuxino: enable device tree mx23_olinuxino: convert MMC to driver model Utkarsh Gupta (2): imx: HAB: Validate IVT before authenticating image imx: hab: Display All HAB events via hab_status command Ye Li (17): imx8mm_evk: Update to latest LPDDR4 script imx8mm_evk: Switch to new imx8mm evk board imx8mp_evk: Update LPDDR4 timing for new FW 202006 imx8mp_evk: Update LPDDR4 refresh time imx8mn: Add low drive mode support for DDR4/LPDDR4 EVK imx8mn: Add support for 11x11 UltraLite part number imx8m: Update thermal and PMU kernel nodes for dual/single cores imx8m: ddr: Disable CA VREF Training for LPDDR4 iMX8MQ: Recognize the B2 revision misc: ocotp: Update OCOTP driver for iMX8MQ B2 imx8mq_evk: Applying default LPDDR4 script for B2 imx: hab: Add function to authenticate kernel image hab: Change calling to ROM API failsafe imx: HAB: Add support for iMX8MM iMX8M: Add support to enable CONFIG_IMX_HAB imx: cmd_dek: Enable DEK only for chips supporting CAAM crypto: fsl: refactor for 32 bit version CAAM support on ARM64 Yuichiro Goto (1): imx: imx6ull: fix pinmux sel_input value for uart5 pins haidong.zheng (1): imx8mp: refine power on imx8mp board arch/arm/Kconfig | 6 + arch/arm/dts/Makefile | 39 ++++- arch/arm/dts/imx23-olinuxino-u-boot.dtsi | 5 + arch/arm/dts/imx23-olinuxino.dts | 131 ++++++++++++++ arch/arm/dts/imx53-usbarmory.dts | 225 ++++++++++++++++++++++++ arch/arm/dts/imx6dl-gw51xx.dts | 13 ++ arch/arm/dts/imx6dl-gw52xx.dts | 71 ++++++++ arch/arm/dts/imx6dl-gw53xx.dts | 71 ++++++++ arch/arm/dts/imx6dl-gw54xx.dts | 71 ++++++++ arch/arm/dts/imx6dl-gw551x.dts | 55 ++++++ arch/arm/dts/imx6dl-gw552x.dts | 14 ++ arch/arm/dts/imx6dl-gw553x.dts | 55 ++++++ arch/arm/dts/imx6dl-gw560x.dts | 55 ++++++ arch/arm/dts/imx6dl-gw5903.dts | 55 ++++++ arch/arm/dts/imx6dl-gw5904.dts | 55 ++++++ arch/arm/dts/imx6dl-gw5907.dts | 14 ++ arch/arm/dts/imx6dl-gw5910.dts | 14 ++ arch/arm/dts/imx6dl-gw5912.dts | 13 ++ arch/arm/dts/imx6dl-gw5913.dts | 14 ++ arch/arm/dts/imx6dl-riotboard-u-boot.dtsi | 8 + arch/arm/dts/imx6dl-riotboard.dts | 594 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6dl-udoo.dts | 14 ++ arch/arm/dts/imx6q-gw51xx.dts | 13 ++ arch/arm/dts/imx6q-gw52xx.dts | 75 ++++++++ arch/arm/dts/imx6q-gw53xx.dts | 75 ++++++++ arch/arm/dts/imx6q-gw54xx.dts | 177 +++++++++++++++++++ arch/arm/dts/imx6q-gw551x.dts | 55 ++++++ arch/arm/dts/imx6q-gw552x.dts | 18 ++ arch/arm/dts/imx6q-gw553x.dts | 55 ++++++ arch/arm/dts/imx6q-gw560x.dts | 59 +++++++ arch/arm/dts/imx6q-gw5903.dts | 55 ++++++ arch/arm/dts/imx6q-gw5904.dts | 59 +++++++ arch/arm/dts/imx6q-gw5907.dts | 14 ++ arch/arm/dts/imx6q-gw5910.dts | 14 ++ arch/arm/dts/imx6q-gw5912.dts | 13 ++ arch/arm/dts/imx6q-gw5913.dts | 14 ++ arch/arm/dts/imx6q-marsboard-u-boot.dtsi | 8 + arch/arm/dts/imx6q-marsboard.dts | 417 ++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6q-phytec-mira-rdk-nand-u-boot.dtsi | 4 + arch/arm/dts/imx6q-udoo.dts | 18 ++ arch/arm/dts/imx6qdl-gw51xx.dtsi | 638 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-gw52xx.dtsi | 782 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-gw53xx.dtsi | 772 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-gw54xx.dtsi | 866 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-gw551x.dtsi | 698 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-gw552x.dtsi | 522 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-gw553x.dtsi | 738 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-gw560x.dtsi | 937 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-gw5903.dtsi | 796 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-gw5904.dtsi | 814 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-gw5907.dtsi | 539 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-gw5910.dtsi | 668 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-gw5912.dtsi | 609 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-gw5913.dtsi | 501 ++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-udoo-u-boot.dtsi | 7 + arch/arm/dts/imx6qdl-udoo.dtsi | 324 ++++++++++++++++++++++++++++++++++ arch/arm/dts/imx8mm-evk-u-boot.dtsi | 118 ++++++++++++- arch/arm/dts/imx8mm-evk.dtsi | 127 +++++++------- arch/arm/dts/imx8mn-beacon-baseboard.dtsi | 71 ++++++++ arch/arm/dts/imx8mn-beacon-som.dtsi | 63 ++++++- arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 115 ++++++++++++ arch/arm/dts/imx8mn-evk-u-boot.dtsi | 128 ++++++++++++++ arch/arm/dts/imx8mn-evk.dts | 128 ++++++++++++++ arch/arm/dts/imx8mn.dtsi | 46 ++++- arch/arm/dts/imx8mp-evk-u-boot.dtsi | 112 ++++++++++++ arch/arm/include/asm/arch-imx/cpu.h | 13 +- arch/arm/include/asm/arch-imx8/image.h | 11 ++ arch/arm/include/asm/arch-imx8m/clock.h | 1 + arch/arm/include/asm/arch-imx8m/imx-regs.h | 21 +++ arch/arm/include/asm/arch-mx6/mx6ull_pins.h | 8 +- arch/arm/include/asm/arch-mx7ulp/imx-regs.h | 12 ++ arch/arm/include/asm/mach-imx/hab.h | 37 +++- arch/arm/include/asm/mach-imx/sys_proto.h | 6 +- arch/arm/mach-imx/Kconfig | 44 ++++- arch/arm/mach-imx/Makefile | 3 + arch/arm/mach-imx/cmd_dek.c | 262 ++++++++++++++++++++++++++-- arch/arm/mach-imx/cmd_mfgprot.c | 150 ++++++++++++++++ arch/arm/mach-imx/cpu.c | 8 +- arch/arm/mach-imx/hab.c | 417 ++++++++++++++++++++++++++++++++++++++------ arch/arm/mach-imx/imx8/Kconfig | 1 + arch/arm/mach-imx/imx8m/Kconfig | 11 ++ arch/arm/mach-imx/imx8m/clock_imx8mm.c | 8 + arch/arm/mach-imx/imx8m/clock_imx8mq.c | 7 + arch/arm/mach-imx/imx8m/soc.c | 190 ++++++++++++++++++-- arch/arm/mach-imx/imx_bootaux.c | 67 ++++++- arch/arm/mach-imx/mx7ulp/Kconfig | 1 + arch/arm/mach-imx/priblob.c | 33 ++++ board/embest/mx6boards/mx6boards.c | 163 +---------------- board/freescale/imx8mm_evk/boot.cmd | 35 ---- board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg | 9 + board/freescale/imx8mm_evk/lpddr4_timing.c | 692 +++++++++++++++++++++++++++++------------------------------------------- board/freescale/imx8mm_evk/spl.c | 33 ++-- board/freescale/imx8mn_evk/Kconfig | 6 +- board/freescale/imx8mn_evk/MAINTAINERS | 3 +- board/freescale/imx8mn_evk/Makefile | 6 + board/freescale/imx8mn_evk/ddr4_timing.c | 1057 +++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------- board/freescale/imx8mn_evk/ddr4_timing_ld.c | 1057 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg | 10 ++ board/freescale/imx8mn_evk/lpddr4_timing.c | 1587 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/freescale/imx8mn_evk/lpddr4_timing_ld.c | 1440 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/freescale/imx8mn_evk/spl.c | 50 +++++- board/freescale/imx8mp_evk/boot.cmd | 25 --- board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg | 10 ++ board/freescale/imx8mp_evk/lpddr4_timing.c | 372 ++++++++++++++++++++++++++++++--------- board/freescale/imx8mp_evk/spl.c | 38 ++-- board/freescale/imx8mq_evk/spl.c | 2 +- board/freescale/imxrt1020-evk/imxrt1020-evk.c | 2 +- board/freescale/imxrt1050-evk/imxrt1050-evk.c | 2 +- board/freescale/mx28evk/MAINTAINERS | 2 +- board/freescale/mx6sabreauto/MAINTAINERS | 2 +- board/freescale/mx6sabresd/MAINTAINERS | 2 +- board/freescale/mx6slevk/MAINTAINERS | 2 +- board/freescale/mx6sxsabreauto/MAINTAINERS | 2 +- board/freescale/mx6sxsabresd/MAINTAINERS | 2 +- board/gateworks/gw_ventana/MAINTAINERS | 48 +++++ board/gateworks/gw_ventana/common.c | 17 -- board/gateworks/gw_ventana/common.h | 1 - board/gateworks/gw_ventana/gsc.c | 88 ++++++++++ board/gateworks/gw_ventana/gsc.h | 1 + board/gateworks/gw_ventana/gw_ventana.c | 138 +++------------ board/gateworks/gw_ventana/gw_ventana_spl.c | 10 +- board/gateworks/venice/gsc.c | 23 +-- board/olimex/mx23_olinuxino/mx23_olinuxino.c | 12 -- board/phytec/phycore_imx8mp/spl.c | 2 +- board/solidrun/mx6cuboxi/MAINTAINERS | 2 +- board/st/stm32f746-disco/stm32f746-disco.c | 2 +- board/technexion/pico-imx6ul/MAINTAINERS | 2 +- board/technexion/pico-imx6ul/pico-imx6ul.c | 2 +- board/udoo/MAINTAINERS | 2 +- board/udoo/udoo.c | 105 +---------- board/wandboard/MAINTAINERS | 2 +- board/warp7/MAINTAINERS | 2 +- cmd/Kconfig | 2 + cmd/blob.c | 16 ++ common/spl/spl_nand.c | 24 ++- configs/gwventana_emmc_defconfig | 20 ++- configs/gwventana_gw5904_defconfig | 20 ++- configs/gwventana_nand_defconfig | 22 ++- configs/imx8mm_evk_defconfig | 6 +- configs/imx8mn_beacon_defconfig | 5 + configs/imx8mn_ddr4_evk_defconfig | 4 +- configs/imx8mn_evk_defconfig | 93 ++++++++++ configs/imx8mp_evk_defconfig | 4 +- configs/marsboard_defconfig | 12 ++ configs/mx23_olinuxino_defconfig | 7 +- configs/riotboard_defconfig | 26 ++- configs/riotboard_spl_defconfig | 70 -------- configs/udoo_defconfig | 13 +- configs/usbarmory_defconfig | 11 ++ doc/board/freescale/imx8mm_evk.rst | 3 +- doc/board/freescale/imx8mn_evk.rst | 3 +- doc/board/freescale/imx8mp_evk.rst | 11 +- doc/board/toradex/apalix-imx8x.rst | 33 ++-- doc/imx/habv4/guides/mx6_mx7_secure_boot.txt | 25 +++ doc/imx/index.rst | 9 + doc/imx/misc/index.rst | 9 + doc/imx/misc/psb.rst | 174 ++++++++++++++++++ doc/index.rst | 11 ++ drivers/crypto/fsl/Kconfig | 6 + drivers/crypto/fsl/Makefile | 4 +- drivers/crypto/fsl/desc.h | 49 +++--- drivers/crypto/fsl/desc_constr.h | 28 +-- drivers/crypto/fsl/fsl_blob.c | 6 + drivers/crypto/fsl/fsl_hash.c | 6 +- drivers/crypto/fsl/fsl_mfgprot.c | 160 +++++++++++++++++ drivers/crypto/fsl/jobdesc.c | 16 +- drivers/crypto/fsl/jr.c | 53 +++--- drivers/crypto/fsl/jr.h | 11 +- drivers/crypto/fsl/type.h | 16 ++ drivers/ddr/imx/imx8m/Kconfig | 8 + drivers/misc/mxc_ocotp.c | 2 +- drivers/mmc/fsl_esdhc_imx.c | 50 ++++-- drivers/mtd/nand/raw/mxs_nand_spl.c | 5 + drivers/power/pmic/pmic_pca9450.c | 4 +- include/configs/apalis_imx6.h | 5 +- include/configs/colibri-imx6ull.h | 2 +- include/configs/colibri_imx6.h | 4 +- include/configs/colibri_imx7.h | 2 +- include/configs/embestmx6boards.h | 7 - include/configs/gw_ventana.h | 15 +- include/configs/imx8mm_evk.h | 8 +- include/configs/imx8mm_venice.h | 4 +- include/configs/imx8mp_evk.h | 8 +- include/configs/pcm058.h | 1 + include/configs/udoo.h | 14 -- include/dt-bindings/media/tda1997x.h | 74 ++++++++ include/fsl_esdhc_imx.h | 2 + include/fsl_sec.h | 54 ++++-- include/power/pca9450.h | 2 +- tools/imx8image.c | 2 +- tools/imx8mimage.c | 2 +- tools/logos/engicam.bmp | Bin 192 files changed, 21396 insertions(+), 2102 deletions(-) create mode 100644 arch/arm/dts/imx23-olinuxino-u-boot.dtsi create mode 100644 arch/arm/dts/imx23-olinuxino.dts create mode 100644 arch/arm/dts/imx53-usbarmory.dts create mode 100644 arch/arm/dts/imx6dl-gw51xx.dts create mode 100644 arch/arm/dts/imx6dl-gw52xx.dts create mode 100644 arch/arm/dts/imx6dl-gw53xx.dts create mode 100644 arch/arm/dts/imx6dl-gw54xx.dts create mode 100644 arch/arm/dts/imx6dl-gw551x.dts create mode 100644 arch/arm/dts/imx6dl-gw552x.dts create mode 100644 arch/arm/dts/imx6dl-gw553x.dts create mode 100644 arch/arm/dts/imx6dl-gw560x.dts create mode 100644 arch/arm/dts/imx6dl-gw5903.dts create mode 100644 arch/arm/dts/imx6dl-gw5904.dts create mode 100644 arch/arm/dts/imx6dl-gw5907.dts create mode 100644 arch/arm/dts/imx6dl-gw5910.dts create mode 100644 arch/arm/dts/imx6dl-gw5912.dts create mode 100644 arch/arm/dts/imx6dl-gw5913.dts create mode 100644 arch/arm/dts/imx6dl-riotboard-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-riotboard.dts create mode 100644 arch/arm/dts/imx6dl-udoo.dts create mode 100644 arch/arm/dts/imx6q-gw51xx.dts create mode 100644 arch/arm/dts/imx6q-gw52xx.dts create mode 100644 arch/arm/dts/imx6q-gw53xx.dts create mode 100644 arch/arm/dts/imx6q-gw54xx.dts create mode 100644 arch/arm/dts/imx6q-gw551x.dts create mode 100644 arch/arm/dts/imx6q-gw552x.dts create mode 100644 arch/arm/dts/imx6q-gw553x.dts create mode 100644 arch/arm/dts/imx6q-gw560x.dts create mode 100644 arch/arm/dts/imx6q-gw5903.dts create mode 100644 arch/arm/dts/imx6q-gw5904.dts create mode 100644 arch/arm/dts/imx6q-gw5907.dts create mode 100644 arch/arm/dts/imx6q-gw5910.dts create mode 100644 arch/arm/dts/imx6q-gw5912.dts create mode 100644 arch/arm/dts/imx6q-gw5913.dts create mode 100644 arch/arm/dts/imx6q-marsboard-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-marsboard.dts create mode 100644 arch/arm/dts/imx6q-udoo.dts create mode 100644 arch/arm/dts/imx6qdl-gw51xx.dtsi create mode 100644 arch/arm/dts/imx6qdl-gw52xx.dtsi create mode 100644 arch/arm/dts/imx6qdl-gw53xx.dtsi create mode 100644 arch/arm/dts/imx6qdl-gw54xx.dtsi create mode 100644 arch/arm/dts/imx6qdl-gw551x.dtsi create mode 100644 arch/arm/dts/imx6qdl-gw552x.dtsi create mode 100644 arch/arm/dts/imx6qdl-gw553x.dtsi create mode 100644 arch/arm/dts/imx6qdl-gw560x.dtsi create mode 100644 arch/arm/dts/imx6qdl-gw5903.dtsi create mode 100644 arch/arm/dts/imx6qdl-gw5904.dtsi create mode 100644 arch/arm/dts/imx6qdl-gw5907.dtsi create mode 100644 arch/arm/dts/imx6qdl-gw5910.dtsi create mode 100644 arch/arm/dts/imx6qdl-gw5912.dtsi create mode 100644 arch/arm/dts/imx6qdl-gw5913.dtsi create mode 100644 arch/arm/dts/imx6qdl-udoo-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-udoo.dtsi create mode 100644 arch/arm/dts/imx8mn-evk-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mn-evk.dts create mode 100644 arch/arm/mach-imx/cmd_mfgprot.c create mode 100644 arch/arm/mach-imx/priblob.c delete mode 100644 board/freescale/imx8mm_evk/boot.cmd create mode 100644 board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg create mode 100644 board/freescale/imx8mn_evk/ddr4_timing_ld.c create mode 100644 board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg create mode 100644 board/freescale/imx8mn_evk/lpddr4_timing.c create mode 100644 board/freescale/imx8mn_evk/lpddr4_timing_ld.c delete mode 100644 board/freescale/imx8mp_evk/boot.cmd create mode 100644 board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg mode change 100644 => 100755 board/freescale/imx8mp_evk/lpddr4_timing.c create mode 100644 configs/imx8mn_evk_defconfig delete mode 100644 configs/riotboard_spl_defconfig create mode 100644 doc/imx/index.rst create mode 100644 doc/imx/misc/index.rst create mode 100644 doc/imx/misc/psb.rst create mode 100644 drivers/crypto/fsl/fsl_mfgprot.c create mode 100644 drivers/crypto/fsl/type.h create mode 100644 include/dt-bindings/media/tda1997x.h mode change 100755 => 100644 tools/logos/engicam.bmp Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[PATCH 00/11] Enable DM_ETH for DPAA1 PowerPC T-series boards
by Camelia Groza 09 Apr '21

09 Apr '21

This patch series enables DM_ETH and DM_MDIO on the T2080RDB, T4240RDB and T1042D4RDB DPAA1 PowerPC boards. The necessary FMan v3 Ethernet and MDIO nodes are added to each platform's SoC and board device tree. On T2080RDB, fdt fixups are performed before booting into the OS using a simplified new routine in order to avoid the legacy code path. Camelia Groza (11): powerpc: dts: t2080: add QorIQ DPAA 1 FMan v3 nodes powerpc: dts: t2080rdb: add FMan v3 nodes board: freescale: t208xrdb: fdt fixups under DM_ETH configs: T2080RDB: enable DM_ETH powerpc: dts: t4240: add QorIQ DPAA 1 FMan v3 nodes powerpc: dts: t4240rdb: add FMan v3 nodes powerpc: dts: qoriq: update the mdio offsets under the second FMan v3 configs: T4240RDB: enable DM_ETH powerpc: dts: t1042: add QorIQ DPAA 1 FMan v3 nodes powerpc: dts: t1042d4rdb: add FMan v3 nodes configs: T1042D4RDB: enable DM_ETH arch/powerpc/dts/qoriq-fman3-1-10g-0.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-10g-1.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-1g-0.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-1g-1.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-1g-2.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-1g-3.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-1g-4.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1-1g-5.dtsi | 2 +- arch/powerpc/dts/qoriq-fman3-1.dtsi | 4 +- arch/powerpc/dts/t1042d4rdb.dts | 55 ++++++++- arch/powerpc/dts/t1042si-post.dtsi | 46 +++++++ arch/powerpc/dts/t2080rdb.dts | 69 ++++++++++- arch/powerpc/dts/t2080si-post.dtsi | 51 ++++++++ arch/powerpc/dts/t4240rdb.dts | 142 +++++++++++++++++++++- arch/powerpc/dts/t4240si-post.dtsi | 101 +++++++++++++++ board/freescale/t208xrdb/eth_t208xrdb.c | 35 ++++++ board/freescale/t208xrdb/t208xrdb.c | 3 + board/freescale/t208xrdb/t208xrdb.h | 2 + configs/T1042D4RDB_NAND_defconfig | 3 + configs/T1042D4RDB_SDCARD_defconfig | 3 + configs/T1042D4RDB_SECURE_BOOT_defconfig | 4 +- configs/T1042D4RDB_SPIFLASH_defconfig | 3 + configs/T1042D4RDB_defconfig | 3 + configs/T2080RDB_NAND_defconfig | 3 + configs/T2080RDB_SDCARD_defconfig | 3 + configs/T2080RDB_SPIFLASH_defconfig | 3 + configs/T2080RDB_defconfig | 3 + configs/T4240RDB_SDCARD_defconfig | 3 + configs/T4240RDB_defconfig | 3 + 29 files changed, 544 insertions(+), 14 deletions(-) create mode 100644 arch/powerpc/dts/t1042si-post.dtsi create mode 100644 arch/powerpc/dts/t2080si-post.dtsi create mode 100644 arch/powerpc/dts/t4240si-post.dtsi -- 2.17.1

1 11

[PATCH V2] arm: stm32mp1: Set soc_type, soc_pkg, soc_rev env variables
by Marek Vasut 09 Apr '21

09 Apr '21

Split up get_soc_name(), clean the decoding up a bit, and set up environment variables which contain the SoC type, package, revision. This is useful on SoMs, where multiple SoC options are populated. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Patrick Delaunay <patrick.delaunay(a)st.com> Cc: Patrice Chotard <patrice.chotard(a)st.com> --- V2: Fix pkg = 0 , which should be *pkg = 0 --- arch/arm/mach-stm32mp/cpu.c | 105 ++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 52 deletions(-) diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c index bc2db535beb..ba8771940ef 100644 --- a/arch/arm/mach-stm32mp/cpu.c +++ b/arch/arm/mach-stm32mp/cpu.c @@ -352,89 +352,78 @@ u32 get_cpu_package(void) return get_otp(BSEC_OTP_PKG, PKG_SHIFT, PKG_MASK); } -void get_soc_name(char name[SOC_NAME_SIZE]) +static const char * const soc_type[] = { + "????", + "151C", "151A", "151F", "151D", + "153C", "153A", "153F", "153D", + "157C", "157A", "157F", "157D" +}; + +static const char * const soc_pkg[] = { "??", "AD", "AC", "AB", "AA" }; +static const char * const soc_rev[] = { "?", "A", "B", "Z" }; + +static void get_cpu_string_offsets(unsigned int *type, unsigned int *pkg, + unsigned int *rev) { - char *cpu_s, *cpu_r, *pkg; + u32 cpu_type = get_cpu_type(); + u32 ct = cpu_type & ~(BIT(7) | BIT(0)); + u32 cm = ((cpu_type & BIT(7)) >> 6) | (cpu_type & BIT(0)); + u32 cp = get_cpu_package(); - /* MPUs Part Numbers */ - switch (get_cpu_type()) { - case CPU_STM32MP157Fxx: - cpu_s = "157F"; - break; - case CPU_STM32MP157Dxx: - cpu_s = "157D"; - break; - case CPU_STM32MP157Cxx: - cpu_s = "157C"; - break; - case CPU_STM32MP157Axx: - cpu_s = "157A"; - break; - case CPU_STM32MP153Fxx: - cpu_s = "153F"; - break; - case CPU_STM32MP153Dxx: - cpu_s = "153D"; + /* Bits 0 and 7 are the ACDF, 00:C 01:A 10:F 11:D */ + switch (ct) { + case CPU_STM32MP151Cxx: + *type = cm + 1; break; case CPU_STM32MP153Cxx: - cpu_s = "153C"; - break; - case CPU_STM32MP153Axx: - cpu_s = "153A"; - break; - case CPU_STM32MP151Fxx: - cpu_s = "151F"; - break; - case CPU_STM32MP151Dxx: - cpu_s = "151D"; + *type = cm + 5; break; - case CPU_STM32MP151Cxx: - cpu_s = "151C"; - break; - case CPU_STM32MP151Axx: - cpu_s = "151A"; + case CPU_STM32MP157Cxx: + *type = cm + 9; break; default: - cpu_s = "????"; + *type = 0; break; } /* Package */ - switch (get_cpu_package()) { + switch (cp) { case PKG_AA_LBGA448: - pkg = "AA"; - break; case PKG_AB_LBGA354: - pkg = "AB"; - break; case PKG_AC_TFBGA361: - pkg = "AC"; - break; case PKG_AD_TFBGA257: - pkg = "AD"; + *pkg = cp; break; default: - pkg = "??"; + *pkg = 0; break; } - /* REVISION */ + /* Revision */ switch (get_cpu_rev()) { case CPU_REVA: - cpu_r = "A"; + *rev = 1; break; case CPU_REVB: - cpu_r = "B"; + *rev = 2; break; case CPU_REVZ: - cpu_r = "Z"; + *rev = 3; break; default: - cpu_r = "?"; + *rev = 0; break; } +} + +void get_soc_name(char name[SOC_NAME_SIZE]) +{ + unsigned int type, pkg, rev; - snprintf(name, SOC_NAME_SIZE, "STM32MP%s%s Rev.%s", cpu_s, pkg, cpu_r); + get_cpu_string_offsets(&type, &pkg, &rev); + + snprintf(name, SOC_NAME_SIZE, "STM32MP%s%s Rev.%s", + soc_type[type], soc_pkg[pkg], soc_rev[rev]); } #if defined(CONFIG_DISPLAY_CPUINFO) @@ -626,11 +615,23 @@ static int setup_serial_number(void) return 0; } +static void setup_soc_type_pkg_rev(void) +{ + unsigned int type, pkg, rev; + + get_cpu_string_offsets(&type, &pkg, &rev); + + env_set("soc_type", soc_type[type]); + env_set("soc_pkg", soc_pkg[pkg]); + env_set("soc_rev", soc_rev[rev]); +} + int arch_misc_init(void) { setup_boot_mode(); setup_mac_address(); setup_serial_number(); + setup_soc_type_pkg_rev(); return 0; } -- 2.30.2

3 2

[PATCH] board: novtech: meerkat96: Add environment variables
by Carl Gelfand 09 Apr '21

09 Apr '21

Add environment variables for booting Linux on imx7d-meerkat96. Signed-off-by: Carl Gelfand <carlgelfand(a)gmail.com> --- include/configs/meerkat96.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h index f43a8415e1..f3a6906054 100644 --- a/include/configs/meerkat96.h +++ b/include/configs/meerkat96.h @@ -33,7 +33,21 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* Environment configs */ - +#define CONFIG_EXTRA_ENV_SETTINGS \ + "image=zImage\0" \ + "console=ttymxc5\0" \ + "bootcmd=mmc dev ${mmcdev};mmc dev ${mmcdev}; if mmc rescan; then if run loadimage; then run mmcboot; else run netboot; fi; else run netboot; fi\0" \ + "fdt_addr=0x83000000\0" \ + "fdt_file=imx7d-meerkat96.dtb\0" \ + "loadaddr=0x80800000\0" \ + "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ + "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} root=${mmcroot}\0" \ + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ + "boot_fdt=try\0" \ + "mmcboot=echo Booting from mmc ...; run mmcargs; if test ${boot_fdt} = yes || test ${boot_fdt} = try; then if run loadfdt; then bootz ${loadaddr} - ${fdt_addr}; else if test ${boot_fdt} = try; then bootz; else echo WARN: Cannot load the DT; fi; fi; else bootz; fi;\0" \ + "mmcdev=0\0" \ + "mmcpart=1\0" \ /* USB configs */ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -- 2.20.1

2 1