April 2019 - U-Boot

[U-Boot] [PATCH] cmd: part: unify syntax of uuid according to start/size subcommands
by roman.stratiienko＠globallogic.com 26 Apr '19

26 Apr '19

From: Roman Stratiienko <roman.stratiienko(a)globallogic.com> This allows retrieving uuid of the partition using it's name. Signed-off-by: Roman Stratiienko <roman.stratiienko(a)globallogic.com> --- cmd/part.c | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/cmd/part.c b/cmd/part.c index bee204f..57657ec 100644 --- a/cmd/part.c +++ b/cmd/part.c @@ -24,31 +24,9 @@ enum cmd_part_info { CMD_PART_INFO_START = 0, CMD_PART_INFO_SIZE, + CMD_PART_INFO_UUID, }; -static int do_part_uuid(int argc, char * const argv[]) -{ - int part; - struct blk_desc *dev_desc; - disk_partition_t info; - - if (argc < 2) - return CMD_RET_USAGE; - if (argc > 3) - return CMD_RET_USAGE; - - part = blk_get_device_part_str(argv[0], argv[1], &dev_desc, &info, 0); - if (part < 0) - return 1; - - if (argc > 2) - env_set(argv[2], info.uuid); - else - printf("%s\n", info.uuid); - - return 0; -} - static int do_part_list(int argc, char * const argv[]) { int ret; @@ -149,6 +127,9 @@ static int do_part_info(int argc, char * const argv[], enum cmd_part_info param) case CMD_PART_INFO_SIZE: snprintf(buf, sizeof(buf), LBAF, info.size); break; + case CMD_PART_INFO_UUID: + snprintf(buf, sizeof(buf), "%s", info.uuid); + break; default: printf("** Unknown cmd_part_info value: %d\n", param); return 1; @@ -177,14 +158,14 @@ static int do_part(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (argc < 2) return CMD_RET_USAGE; - if (!strcmp(argv[1], "uuid")) - return do_part_uuid(argc - 2, argv + 2); - else if (!strcmp(argv[1], "list")) + if (!strcmp(argv[1], "list")) return do_part_list(argc - 2, argv + 2); else if (!strcmp(argv[1], "start")) return do_part_start(argc - 2, argv + 2); else if (!strcmp(argv[1], "size")) return do_part_size(argc - 2, argv + 2); + else if (!strcmp(argv[1], "uuid")) + return do_part_info(argc - 2, argv + 2, CMD_PART_INFO_UUID); return CMD_RET_USAGE; } @@ -192,10 +173,6 @@ static int do_part(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD( part, CONFIG_SYS_MAXARGS, 1, do_part, "disk partition related commands", - "uuid <interface> <dev>:<part>\n" - " - print partition UUID\n" - "part uuid <interface> <dev>:<part> <varname>\n" - " - set environment variable to partition UUID\n" "part list <interface> <dev>\n" " - print a device's partition table\n" "part list <interface> <dev> [flags] <varname>\n" @@ -206,5 +183,8 @@ U_BOOT_CMD( " part can be either partition number or partition name\n" "part size <interface> <dev> <part> <varname>\n" " - set environment variable to the size of the partition (in blocks)\n" + " part can be either partition number or partition name\n" + "part uuid <interface> <dev> <part> <varname>\n" + " - set environment variable to the uuid of the partition\n" " part can be either partition number or partition name" ); -- 2.7.4

3 2

[U-Boot] [PATCH] lib/vsprintf: allow printing upper case GUIDs
by Heinrich Schuchardt 25 Apr '19

25 Apr '19

In the UEFI context GUIDs are expected to be rendered in upper case. The patch uses the formerly unused bit 1 of the parameter str_format of function uuid_bin_to_str() to indicate if we need upper or lower case output. Function uuid_string() in vsprint.c is adjusted to correctly set the bit depending on the print format code. %pUb: 01020304-0506-0708-090a-0b0c0d0e0f10 %pUB: 01020304-0506-0708-090A-0B0C0D0E0F10 %pUl: 04030201-0605-0807-090a-0b0c0d0e0f10 %pUL: 04030201-0605-0807-090A-0B0C0D0E0F10 Up to this point only a diagnostic message in mount_ubifs() using '%pUB' is concerned by the change. Further patches are needed to adjust the UEFI subsystem. A unit test is provided inside the ut_print command. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- I suggest to merge the patch via the u-boot-efi repository. --- include/uuid.h | 8 ++++---- lib/uuid.c | 18 ++++++++++++------ lib/vsprintf.c | 14 ++++++++------ test/print_ut.c | 22 ++++++++++++++++++++++ 4 files changed, 46 insertions(+), 16 deletions(-) diff --git a/include/uuid.h b/include/uuid.h index 124bbce8a2..47d5b0d8d4 100644 --- a/include/uuid.h +++ b/include/uuid.h @@ -16,10 +16,10 @@ struct uuid { unsigned char node[6]; } __packed; -enum { - UUID_STR_FORMAT_STD, - UUID_STR_FORMAT_GUID -}; +/* Bits of a bitmask specifying the output format for GUIDs */ +#define UUID_STR_FORMAT_STD 0 +#define UUID_STR_FORMAT_GUID 1 +#define UUID_STR_UPPER_CASE 2 #define UUID_STR_LEN 36 #define UUID_BIN_LEN sizeof(struct uuid) diff --git a/lib/uuid.c b/lib/uuid.c index fa20ee39fc..14d7f8ce7e 100644 --- a/lib/uuid.c +++ b/lib/uuid.c @@ -187,9 +187,10 @@ int uuid_str_to_bin(char *uuid_str, unsigned char *uuid_bin, int str_format) /* * uuid_bin_to_str() - convert big endian binary data to string UUID or GUID. * - * @param uuid_bin - pointer to binary data of UUID (big endian) [16B] - * @param uuid_str - pointer to allocated array for output string [37B] - * @str_format - UUID string format: 0 - UUID; 1 - GUID + * @param uuid_bin: pointer to binary data of UUID (big endian) [16B] + * @param uuid_str: pointer to allocated array for output string [37B] + * @str_format: bit 0: 0 - UUID; 1 - GUID + * bit 1: 0 - lower case; 2 - upper case */ void uuid_bin_to_str(unsigned char *uuid_bin, char *uuid_str, int str_format) { @@ -198,6 +199,7 @@ void uuid_bin_to_str(unsigned char *uuid_bin, char *uuid_str, int str_format) const u8 guid_char_order[UUID_BIN_LEN] = {3, 2, 1, 0, 5, 4, 7, 6, 8, 9, 10, 11, 12, 13, 14, 15}; const u8 *char_order; + const char *format; int i; /* @@ -205,13 +207,17 @@ void uuid_bin_to_str(unsigned char *uuid_bin, char *uuid_str, int str_format) * 4B-2B-2B-2B-6B * be be be be be */ - if (str_format == UUID_STR_FORMAT_STD) + if (str_format & UUID_STR_FORMAT_GUID) + char_order = guid_char_order; + else char_order = uuid_char_order; + if (str_format & UUID_STR_UPPER_CASE) + format = "%02X"; else - char_order = guid_char_order; + format = "%02x"; for (i = 0; i < 16; i++) { - sprintf(uuid_str, "%02x", uuid_bin[char_order[i]]); + sprintf(uuid_str, format, uuid_bin[char_order[i]]); uuid_str += 2; switch (i) { case 3: diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 2403825dc9..f1332df0f3 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -382,29 +382,31 @@ static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width, #ifdef CONFIG_LIB_UUID /* - * This works (roughly) the same way as linux's, but we currently always - * print lower-case (ie. we just keep %pUB and %pUL for compat with linux), - * mostly just because that is what uuid_bin_to_str() supports. + * This works (roughly) the same way as Linux's. * * %pUb: 01020304-0506-0708-090a-0b0c0d0e0f10 + * %pUB: 01020304-0506-0708-090A-0B0C0D0E0F10 * %pUl: 04030201-0605-0807-090a-0b0c0d0e0f10 + * %pUL: 04030201-0605-0807-090A-0B0C0D0E0F10 */ static char *uuid_string(char *buf, char *end, u8 *addr, int field_width, int precision, int flags, const char *fmt) { char uuid[UUID_STR_LEN + 1]; - int str_format = UUID_STR_FORMAT_STD; + int str_format; switch (*(++fmt)) { case 'L': + str_format = UUID_STR_FORMAT_GUID | UUID_STR_UPPER_CASE; + break; case 'l': str_format = UUID_STR_FORMAT_GUID; break; case 'B': - case 'b': - /* this is the default */ + str_format = UUID_STR_FORMAT_STD | UUID_STR_UPPER_CASE; break; default: + str_format = UUID_STR_FORMAT_STD; break; } diff --git a/test/print_ut.c b/test/print_ut.c index f0f1d6010a..4ec414940f 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -15,6 +15,25 @@ #define FAKE_BUILD_TAG "jenkins-u-boot-denx_uboot_dm-master-build-aarch64" \ "and a lot more text to come" +/* Test printing GUIDs */ +static void guid_ut_print(void) +{ +#if CONFIG_IS_ENABLED(LIB_UUID) + unsigned char guid[16] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 + }; + char str[40]; + + assert(!strcmp("01020304-0506-0708-090a-0b0c0d0e0f10", str)); + sprintf(str, "%pUB", guid); + assert(!strcmp("01020304-0506-0708-090A-0B0C0D0E0F10", str)); + sprintf(str, "%pUl", guid); + assert(!strcmp("04030201-0605-0807-090a-0b0c0d0e0f10", str)); + sprintf(str, "%pUL", guid); + assert(!strcmp("04030201-0605-0807-090A-0B0C0D0E0F10", str)); +#endif +} + /* Test efi_loader specific printing */ static void efi_ut_print(void) { @@ -113,6 +132,9 @@ static int do_ut_print(cmd_tbl_t *cmdtp, int flag, int argc, /* Test efi_loader specific printing */ efi_ut_print(); + /* Test printing GUIDs */ + guid_ut_print(); + printf("%s: Everything went swimmingly\n", __func__); return 0; } -- 2.20.1

1 0

[U-Boot] [PATCH 0/4] AE350 support SMP boot from flash
by Andes 25 Apr '19

25 Apr '19

From: Rick Chen <rick(a)andestech.com> In current RISC-V SMP flow, AE350 will encounter the the write failure problem since hart_lottery and available_harts_lock was not in ram address but in flash address when booing from flash. This patch can help to fix the failure problem when AE350 was booting from flash by disable this two features. Rick Chen (4): riscv: hart_lottery and available harts feature can be seletable riscv: configs: Support AE350 SMP boot from flash flow riscv: prior_stage_fdt_address only be used when OF_PRIOR_STAGE is enable riscv: configs: AE350 will use OF_PRIOR_STAGE when boot from ram arch/riscv/Kconfig | 21 ++++++++++++++++++++ arch/riscv/cpu/cpu.c | 4 ++++ arch/riscv/cpu/start.S | 11 ++++++++++- arch/riscv/include/asm/global_data.h | 2 ++ arch/riscv/lib/asm-offsets.c | 2 ++ arch/riscv/lib/smp.c | 2 ++ configs/ae350_rv32_defconfig | 2 +- configs/ae350_rv32_xip_defconfig | 37 +++++++++++++++++++++++++++++++++++ configs/ae350_rv64_defconfig | 2 +- configs/ae350_rv64_xip_defconfig | 38 ++++++++++++++++++++++++++++++++++++ 10 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 configs/ae350_rv32_xip_defconfig create mode 100644 configs/ae350_rv64_xip_defconfig -- 2.7.4

4 18

[U-Boot] [PATCH v2 00/11] efi_loader: non-volatile variables support
by AKASHI Takahiro 25 Apr '19

25 Apr '19

This patch set is an attempt to implement non-volatile attribute for UEFI variables. Under the current implementation, * SetVariable API doesn't recognize non-volatile attribute * While some variables are defined non-volatile in UEFI specification, they are NOT marked as non-volatile in the code. * env_save() (or "env save" command) allows us to save all the variables into persistent storage, but it may cause volatile UEFI variables, along with irrelevant U-Boot variables, to be saved unconditionally. Those observation rationalizes that the implementation of UEFI variables should be revamped utilizing dedicated storage for them. This patch set is yet experimental and rough-edged(See known issues below), but shows how UEFI variables can be split from U-Boot environment. This enhancement will also be vital when we introduce UEFI secure boot where secure and tamper-resistant storage (with authentication) is required. Usage: To enable this feature, the following configs must be enabled: CONFIG_ENV_IS_IN_FAT CONFIG_ENV_FAT_INTERFACE CONFIG_ENV_EFI_FAT_DEVICE_AND_PART CONFIG_ENV_EFI_FAT_FILE You can also define a non-volatile variable from command interface: => setenv -e -nv FOO baa Known issues/restriction: * UEFI spec defines "globally defined variables" with specific attributes, but with this patch, we don't check against the user-supplied attribute for any variable. * Only FAT can be enabled for persistent storage for UEFI non-volatile variables. * The whole area of storage will be saved at every update of one variable. It can be optimized. * An error during saving may cause inconsistency between cache (hash table) and the storage. * Cache is of fixed size and can be quite big for normal usage. Patch#1 to #4 are preparatory so that we won't rely on U-Boot environment, that is, env_get/set() helper functions. Patch#5 to #8 are core part of changes. Patch#9 to #11 are for modifying variable attributes. Changes in v2 (Apr 24, 2019) * rebased on efi-2019-07 * revamp the implementation v1 (Nov 28, 2018) * initial AKASHI Takahiro (11): lib: charset: add u16_strcmp() lib: charset: add u16_strncmp() cmd: efidebug: rework "boot dump" sub-command using GetNextVariableName() efi_loader: set OsIndicationsSupported at init env: save UEFI non-volatile variables in dedicated storage efi_loader: variable: support non-volatile attribute efi_loader: variable: split UEFI variables from U-Boot environment efi_loader: load saved non-volatile variables at init efi_loader: bootmgr: handle BootNext as non-volatile cmd: env: add -nv option for UEFI non-volatile variable cmd: efidebug: make some boot variables non-volatile cmd/bootefi.c | 4 - cmd/efidebug.c | 95 +++++++++++----- cmd/nvedit.c | 3 +- cmd/nvedit_efi.c | 15 ++- env/Kconfig | 34 ++++++ env/env.c | 98 ++++++++++++++++- env/fat.c | 109 +++++++++++++++++++ include/asm-generic/global_data.h | 1 + include/charset.h | 10 ++ include/environment.h | 24 +++++ lib/charset.c | 23 ++++ lib/efi_loader/efi_bootmgr.c | 3 +- lib/efi_loader/efi_setup.c | 13 +++ lib/efi_loader/efi_variable.c | 174 ++++++++++++++++++++++++++++-- 14 files changed, 560 insertions(+), 46 deletions(-) -- 2.20.1

2 21

[U-Boot] [PATCH] RISCV: image: Add booti support.
by Atish Patra 25 Apr '19

25 Apr '19

This patch adds booti support for RISC-V Linux kernel. The existing bootm method will also continue to work as it is. It depends on the following kernel patch which adds the header to the flat Image. https://patchwork.kernel.org/patch/10913869/ Tested on HiFive Unleashed and QEMU. Currently, compressed images such as Image.gz are not supported. Signed-off-by: Atish Patra <atish.patra(a)wdc.com> --- arch/riscv/lib/Makefile | 1 + arch/riscv/lib/image.c | 60 +++++++++++++++++++++++++++++++++++++++++ cmd/Kconfig | 2 +- cmd/booti.c | 8 ++++-- 4 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 arch/riscv/lib/image.c diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile index 1c332db436a9..6ae6ebbeafda 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -7,6 +7,7 @@ # Rick Chen, Andes Technology Corporation <rick(a)andestech.com> obj-$(CONFIG_CMD_BOOTM) += bootm.o +obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o obj-$(CONFIG_CMD_GO) += boot.o obj-y += cache.o obj-$(CONFIG_RISCV_RDTIME) += rdtime.o diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c new file mode 100644 index 000000000000..99c2e31066a3 --- /dev/null +++ b/arch/riscv/lib/image.c @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Western Digital Corporation or its affiliates. + * Authors: + * Atish Patra <atish.patra(a)wdc.com> + * Based on arm/lib/image.c + */ + +#include <common.h> +#include <mapmem.h> +#include <linux/sizes.h> +#include <linux/stddef.h> + +DECLARE_GLOBAL_DATA_PTR; + +/* ASCII version of "RISCV" defined in Linux kernel */ +#define LINUX_RISCV_IMAGE_MAGIC 0x5643534952 + +struct linux_image_h { + uint32_t code0; /* Executable code */ + uint32_t code1; /* Executable code */ + uint64_t text_offset; /* Image load offset */ + uint64_t image_size; /* Effective Image size */ + uint64_t res1; /* reserved */ + uint64_t magic; /* Magic number */ + uint32_t res2; /* reserved */ + uint32_t res3; /* reserved */ +}; + +int booti_setup(ulong image, ulong *relocated_addr, ulong *size, + bool force_reloc) +{ + struct linux_image_h *lhdr; + uint64_t dst; + uint64_t image_size, text_offset; + + *relocated_addr = image; + + lhdr = (struct linux_image_h *)map_sysmem(image, 0); + + if (lhdr->magic != LINUX_RISCV_IMAGE_MAGIC) { + puts("Bad Linux RISCV Image magic!\n"); + return 1; + } + + if (lhdr->image_size != 0) { + image_size = lhdr->image_size; + text_offset = lhdr->text_offset; + } else { + puts("Image lacks image_size field, Error!!\n"); + return 1; + } + *size = image_size; + dst = gd->ram_base; + *relocated_addr = dst + text_offset; + + unmap_sysmem(lhdr); + + return 0; +} diff --git a/cmd/Kconfig b/cmd/Kconfig index 2bdbfcb3d091..d427b66d3714 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -212,7 +212,7 @@ config CMD_BOOTZ config CMD_BOOTI bool "booti" - depends on ARM64 + depends on ARM64 || RISCV default y help Boot an AArch64 Linux Kernel image from memory. diff --git a/cmd/booti.c b/cmd/booti.c index 04353b68eccc..c22ba9bae2e4 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -77,7 +77,11 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bootm_disable_interrupts(); images.os.os = IH_OS_LINUX; + #ifdef CONFIG_RISCV_SMODE + images.os.arch = IH_ARCH_RISCV; + #elif CONFIG_ARM64 images.os.arch = IH_ARCH_ARM64; + #endif ret = do_bootm_states(cmdtp, flag, argc, argv, #ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH BOOTM_STATE_RAMDISK | @@ -92,7 +96,7 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef CONFIG_SYS_LONGHELP static char booti_help_text[] = "[addr [initrd[:size]] [fdt]]\n" - " - boot arm64 Linux Image stored in memory\n" + " - boot arm64/riscv Linux Image stored in memory\n" "\tThe argument 'initrd' is optional and specifies the address\n" "\tof an initrd in memory. The optional parameter ':size' allows\n" "\tspecifying the size of a RAW initrd.\n" @@ -107,5 +111,5 @@ static char booti_help_text[] = U_BOOT_CMD( booti, CONFIG_SYS_MAXARGS, 1, do_booti, - "boot arm64 Linux Image image from memory", booti_help_text + "boot arm64/riscv Linux Image image from memory", booti_help_text ); -- 2.21.0

2 2

[U-Boot] [PATCH 1/1] efi_loader: FreePages() must fail with pages = 0
by Heinrich Schuchardt 25 Apr '19

25 Apr '19

The UEFI spec requires that freeing of pages fails if the number of pages to be freed is 'invalid'. Check that it is not zero. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 987cc6dc5f..776077cc35 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -452,7 +452,7 @@ efi_status_t efi_free_pages(uint64_t memory, efi_uintn_t pages) uint64_t r = 0; /* Sanity check */ - if (!memory || (memory & EFI_PAGE_MASK)) { + if (!memory || (memory & EFI_PAGE_MASK) || !pages) { printf("%s: illegal free 0x%llx, 0x%zx\n", __func__, memory, pages); return EFI_INVALID_PARAMETER; -- 2.20.1

2 1

[U-Boot] [PATCH v2 0/5] boot_get_fdt: clean up and use 'fdtaddr' as fallback for Android
by Eugeniu Rosca 25 Apr '19

25 Apr '19

The main feature added in this series is being able to boot Android images with empty/non-DTB contents in the second area by using the address stored in the 'fdtaddr' environment variable. More details in "fdt: boot_get_fdt: android: use ENV 'fdtaddr' as fallback". This is combined with a number of small-sized (review-friendly) cleanup patches, attempting to increase the readability of boot_get_fdt(). They are partitioned into functional (assumed to add a change in runtime behavior) and non-functional changes. Comments/thoughts appreciated! TIA! Changes in v2: - Dropped centralized fdt_len verification since it only makes sense for DT blobs embedded in the U-Boot-supported images (in which case two FDT size values are available and can be compared, one from the booted image via an image-specific API and one from the FDT itself via fdt_totalsize). Centralized fdt_len verification doesn't make much sense in case of user-provided DT blobs (via boot{m,*} command or via some environment variable) - Fixed 'booti' regression on arm64/R-Car3 - Fixed a number of typos - Link v1: https://patchwork.ozlabs.org/patch/1071586/ Eugeniu Rosca (5): fdt: boot_get_fdt: remove redundant zeroing out fdt: boot_get_fdt: really boot w/o FDT when "goto no_fdt" fdt: boot_get_fdt: simplify no_fdt handling (non-functional) fdt: boot_get_fdt: android: compress handling (non-functional) fdt: boot_get_fdt: android: use ENV 'fdtaddr' as fallback common/image-fdt.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) -- 2.21.0

3 20

[U-Boot] [PATCH v3 0/9] pico-imx7d: Add support for BL33 case
by Jun Nie 25 Apr '19

25 Apr '19

Add configuration to boot U-boot as BL33 case. The boot flow is ATF -> OPTEE -> U-boot. Changes vs V2: - Revise fix to UART clock ID. - Add documentation of build and test for BL33 usage case. - Add device tree to store public key for FIT image verfication usage. - Add revert patch to LCD support. Pico-pi does not boot with it. I see it is suggested to be reverted in maillist. Changes vs V1: - Remove DCD file. - Add a patch to fix uart clock root ID. - Change file name from pico-pi-imx7d_bl33_defconfig to pico-imx7d_bl33_defconfig Jun Nie (9): Revert "pico-imx7d: Add LCD support" mx7_common: Share configs to skip low level init imx: mx7: Add empty arch_cpu_init if skipped pico-imx7d: Correct uart clock root pico-imx7d: Reserve region of memory to OPTEE pico-imx7d: Add boot option for verified boot pico-imx7d: Add device tree for pico-imx7d pico-imx7d: Add bl33 config pico-imx7d: README: Add BL33 usage case arch/arm/dts/Makefile | 1 + arch/arm/dts/imx7d-pico-pi.dts | 93 ++++ arch/arm/dts/imx7d-pico.dtsi | 585 +++++++++++++++++++++ arch/arm/include/asm/arch-mx7/clock.h | 18 + arch/arm/mach-imx/Kconfig | 7 + arch/arm/mach-imx/mx7/clock.c | 2 +- arch/arm/mach-imx/mx7/soc.c | 5 + board/technexion/pico-imx7d/README.pico-imx7d_BL33 | 44 ++ board/technexion/pico-imx7d/pico-imx7d.c | 60 +-- configs/pico-hobbit-imx7d_defconfig | 1 - ...i-imx7d_defconfig => pico-imx7d_bl33_defconfig} | 40 +- configs/pico-imx7d_defconfig | 1 - configs/pico-pi-imx7d_defconfig | 1 - include/configs/mx7_common.h | 11 + include/configs/pico-imx7d.h | 50 +- include/configs/warp7.h | 11 - 16 files changed, 826 insertions(+), 104 deletions(-) create mode 100644 arch/arm/dts/imx7d-pico-pi.dts create mode 100644 arch/arm/dts/imx7d-pico.dtsi create mode 100644 board/technexion/pico-imx7d/README.pico-imx7d_BL33 copy configs/{pico-pi-imx7d_defconfig => pico-imx7d_bl33_defconfig} (65%) -- 2.7.4

4 27

[U-Boot] [PATCH] pico-imx6ul: Add DWARF baseboard support
by Otavio Salvador 25 Apr '19

25 Apr '19

This add the boot menu option for the DWARF baseboard as well as a specific config file for users which wish to use it as a pre-defined board. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- configs/pico-dwarf-imx6ul_defconfig | 64 +++++++++++++++++++++++++++++ include/configs/pico-imx6ul.h | 6 ++- 2 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 configs/pico-dwarf-imx6ul_defconfig diff --git a/configs/pico-dwarf-imx6ul_defconfig b/configs/pico-dwarf-imx6ul_defconfig new file mode 100644 index 0000000000..e7af415abd --- /dev/null +++ b/configs/pico-dwarf-imx6ul_defconfig @@ -0,0 +1,64 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_PICO_IMX6UL=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL=y +CONFIG_SPL_LIBDISK_SUPPORT=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" +CONFIG_BOOTDELAY=3 +CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd" +CONFIG_DEFAULT_FDT_FILE="imx6ul-pico-dwarf.dtb" +CONFIG_BOUNCE_BUFFER=y +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_GADGET=y +CONFIG_SPL_USB_SDP_SUPPORT=y +CONFIG_CMD_BOOTMENU=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_DFU=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_SDP=y +CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="imx6ul-pico-pi" +CONFIG_ENV_IS_IN_MMC=y +CONFIG_DFU_MMC=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_FASTBOOT_BUF_SIZE=0x10000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=0 +CONFIG_FASTBOOT_CMD_OEM_FORMAT=y +CONFIG_DM_GPIO=y +CONFIG_DM_I2C=y +CONFIG_DM_MMC=y +CONFIG_FSL_ESDHC=y +CONFIG_PHYLIB=y +CONFIG_PHY_MICREL=y +CONFIG_MII=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX6=y +CONFIG_DM_PMIC=y +CONFIG_DM_PMIC_PFUZE100=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_PFUZE100=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_USB=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 050f69801b..f0dadc4b1e 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -64,9 +64,11 @@ "rootfs part 0 1\0" \ #define BOOTMENU_ENV \ - "bootmenu_0=Boot using PICO-Hobbit baseboard=" \ + "bootmenu_0=Boot using PICO-Dwarf baseboard=" \ + "setenv fdtfile imx6ul-pico-dwarf.dtb\0" \ + "bootmenu_1=Boot using PICO-Hobbit baseboard=" \ "setenv fdtfile imx6ul-pico-hobbit.dtb\0" \ - "bootmenu_1=Boot using PICO-Pi baseboard=" \ + "bootmenu_2=Boot using PICO-Pi baseboard=" \ "setenv fdtfile imx6ul-pico-pi.dtb\0" \ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 -- 2.21.0

2 1

[U-Boot] [PATCH v2 1/2] net: eth-uclass: Write MAC address to hardware after probe
by Thierry Reding 25 Apr '19

25 Apr '19

From: Thierry Reding <treding(a)nvidia.com> In order for the device to use the proper MAC address, which can have been configured in the environment prior to the device being registered, ensure that the MAC address is written after the device has been probed. For devices that are registered before the network stack is initialized, this is already done during eth_initialize(). If the Ethernet device is on a bus that is not initialized on early boot, such as PCI, the device is not available at the time eth_initialize() is called, so we need the MAC address programming to also happen after probe. Signed-off-by: Thierry Reding <treding(a)nvidia.com> --- net/eth-uclass.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 2ef20df19203..4225aabf1fa1 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -524,6 +524,8 @@ static int eth_post_probe(struct udevice *dev) #endif } + eth_write_hwaddr(dev); + return 0; } -- 2.21.0

4 8