May 2018 - U-Boot

[U-Boot] [PATCH v2 0/3] Generic file system firmware loader DM
by tien.fong.chee＠intel.com 12 Jun '18

12 Jun '18

From: Tien Fong Chee <tien.fong.chee(a)intel.com> This patchset contains generic file system loader DM which is very close to Linux firmware loader but for U-Boot framework. Generic file system firmware loader can be used load whatever into target location, and then consumer driver would use it to program whatever, ie. the FPGA. This version mainly resolved comments from Tom Rini in [v1]. This series is working on top of u-boot-socfpga.git - http://git.denx.de/u-boot.git . [v1]: https://www.mail-archive.com/u-boot@lists.denx.de/msg286294.html v1 -> v2 changes ---------------- - Changed the documents to rST format. Tien Fong Chee (3): doc: Add new doc for file system firmware loader driver model doc: dtbinding: Add file system firmware loader binding document common: Generic loader for file system doc/device-tree-bindings/misc/fs_loader.txt | 50 ++++++ doc/driver-model/fs_firmware_loader.txt | 103 ++++++++++++ drivers/misc/Kconfig | 11 ++ drivers/misc/Makefile | 1 + drivers/misc/fs_loader.c | 240 ++++++++++++++++++++++++++++ include/dm/uclass-id.h | 1 + include/fs_loader.h | 28 ++++ 7 files changed, 434 insertions(+) create mode 100644 doc/device-tree-bindings/misc/fs_loader.txt create mode 100644 doc/driver-model/fs_firmware_loader.txt create mode 100644 drivers/misc/fs_loader.c create mode 100644 include/fs_loader.h -- 2.2.0

4 25

[U-Boot] [PATCH] x86: Use microcode update from device tree for all processors
by Ivan Gorinov 12 Jun '18

12 Jun '18

The microcode update data block encoded in Device Tree is used by the bootstrap processor (BSP) but not passed to the other CPUs (AP). If the bootstrap processor successfully performs a microcode update from Device Tree, use the same data block for the other processors. Signed-off-by: Ivan Gorinov <ivan.gorinov(a)intel.com> --- arch/x86/cpu/i386/cpu.c | 3 ++- arch/x86/cpu/intel_common/car.S | 2 ++ arch/x86/cpu/intel_common/microcode.c | 10 +++++++--- arch/x86/include/asm/microcode.h | 1 + arch/x86/lib/fsp/fsp_car.S | 2 ++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c index aabdc94..05d8312 100644 --- a/arch/x86/cpu/i386/cpu.c +++ b/arch/x86/cpu/i386/cpu.c @@ -26,6 +26,7 @@ #include <asm/mp.h> #include <asm/msr.h> #include <asm/mtrr.h> +#include <asm/microcode.h> #include <asm/processor-flags.h> DECLARE_GLOBAL_DATA_PTR; @@ -586,7 +587,7 @@ int x86_mp_init(void) mp_params.parallel_microcode_load = 0, mp_params.flight_plan = &mp_steps[0]; mp_params.num_records = ARRAY_SIZE(mp_steps); - mp_params.microcode_pointer = 0; + mp_params.microcode_pointer = (void *)ucode_base; if (mp_init(&mp_params)) { printf("Warning: MP init failure\n"); diff --git a/arch/x86/cpu/intel_common/car.S b/arch/x86/cpu/intel_common/car.S index 6e0db96..099bf28 100644 --- a/arch/x86/cpu/intel_common/car.S +++ b/arch/x86/cpu/intel_common/car.S @@ -240,4 +240,6 @@ _dt_ucode_base_size: .globl ucode_base ucode_base: /* Declared in microcode.h */ .long 0 /* microcode base */ +.globl ucode_size +ucode_size: /* Declared in microcode.h */ .long 0 /* microcode size */ diff --git a/arch/x86/cpu/intel_common/microcode.c b/arch/x86/cpu/intel_common/microcode.c index 8813258..9321ae1 100644 --- a/arch/x86/cpu/intel_common/microcode.c +++ b/arch/x86/cpu/intel_common/microcode.c @@ -44,8 +44,6 @@ static int microcode_decode_node(const void *blob, int node, update->data = fdt_getprop(blob, node, "data", &update->size); if (!update->data) return -ENOENT; - update->data += UCODE_HEADER_LEN; - update->size -= UCODE_HEADER_LEN; update->header_version = fdtdec_get_int(blob, node, "intel,header-version", 0); @@ -125,6 +123,7 @@ static void microcode_read_cpu(struct microcode_update *cpu) int microcode_update_intel(void) { struct microcode_update cpu, update; + ulong address; const void *blob = gd->fdt_blob; int skipped; int count; @@ -168,7 +167,8 @@ int microcode_update_intel(void) skipped++; continue; } - wrmsr(MSR_IA32_UCODE_WRITE, (ulong)update.data, 0); + address = (ulong)update.data + UCODE_HEADER_LEN; + wrmsr(MSR_IA32_UCODE_WRITE, address, 0); rev = microcode_read_rev(); debug("microcode: updated to revision 0x%x date=%04x-%02x-%02x\n", rev, update.date_code & 0xffff, @@ -179,5 +179,9 @@ int microcode_update_intel(void) return -EFAULT; } count++; + if (!ucode_base) { + ucode_base = (ulong)update.data; + ucode_size = update.size; + } } while (1); } diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h index 29bf060..b30b8b6 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -11,6 +11,7 @@ /* This is a declaration for ucode_base in start.S */ extern u32 ucode_base; +extern u32 ucode_size; /** * microcode_update_intel() - Apply microcode updates diff --git a/arch/x86/lib/fsp/fsp_car.S b/arch/x86/lib/fsp/fsp_car.S index fbe8aef..157600a 100644 --- a/arch/x86/lib/fsp/fsp_car.S +++ b/arch/x86/lib/fsp/fsp_car.S @@ -105,6 +105,8 @@ _dt_ucode_base_size: .globl ucode_base ucode_base: /* Declared in micrcode.h */ .long 0 /* microcode base */ +.globl ucode_size +ucode_size: /* Declared in micrcode.h */ .long 0 /* microcode size */ .long CONFIG_SYS_MONITOR_BASE /* code region base */ .long CONFIG_SYS_MONITOR_LEN /* code region size */ -- 2.7.4

3 8

[U-Boot] Uboot as x86_64 EFI payload
by Juan Alfonso Reyes Ajenjo 10 Jun '18

10 Jun '18

Hi, I am Juan Alfonso Reyes, a firmware engineer in GMV. Currently we are developing new boards based in Apollo Lake CPU. We are trying to load uboot from UEFI. Using the default qemu-x86_efi_payload64_defconfig we are getting "U-Boot EFI Payload 2002 No memory map" error code. As I can see in the code 2002 means (efi_stub.c): ret = boot->get_memory_map(&size, NULL, &key, &desc_size, &version); if (ret != EFI_BUFFER_TOO_SMALL) { printhex2(BITS_PER_LONG); printhex2(ret); puts(" No memory map\n"); while(1); return ret; } 0x20 -> BITS_PER_LONG 32bits 0x02 -> EFI_INVALID_PARAMETER 32bits sounds weird for me, so I changed config to use CONFIG_X86_RUN_64BIT instead of CONFIG_X86_RUN_32BIT. I have changed it and I got a compilation error: In file included from include/common.h:53:0, from cmd/efi.c:8: cmd/efi.c: In function 'do_efi_mem': ./arch/x86/include/asm/global_data.h:117:12: error: 'global_data_ptr' undeclared (first use in this function) #define gd global_data_ptr I have surfed in the code and I have found this in ./arch/x86/include/asm/global_data.h # if defined(CONFIG_EFI_APP) || CONFIG_IS_ENABLED(X86_64) /* TODO(sjg(a)chromium.org<mailto:sjg@chromium.org>): Consider using a fixed register for gd on x86_64 */ #define gd global_data_ptr What do you mean with "Consider using a fixed register for gd" ?Can you help us to make this work? Are we in the correct direction? Thank you very much, Best regards, ________________________________ [cid:image001.gif@01D39918.97D8D0B0] Juan Alfonso Reyes Ajenjo Ingeniero en Informatica / Computer Systems Engineer Ingeniero en Automática y Electrónica Industrial / Automation and Industrial Electronics Engineer GMV Juan de Herrera nº17 Boecillo E-47151 Valladolid Tel. +34 983 54 65 54 Fax +34 983 54 65 53 www.gmv.com <http://www.gmv.com/> [cid:image002.png@01D39918.97D8D0B0]<http://www.facebook.com/infoGMV> [cid:image003.png@01D39918.97D8D0B0]<http://www.twitter.com/infoGMV_es> [cid:image004.png@01D39918.97D8D0B0]<https://plus.google.com/+Gmvcompany> [cid:image005.png@01D39918.97D8D0B0]<http://www.youtube.com/infoGMV> [cid:image006.png@01D39918.97D8D0B0]<https://www.linkedin.com/company/gmv> [cid:image007.png@01D39918.97D8D0B0]<http://www.gmv.com/en/RSS> [cid:image008.png@01D39918.97D8D0B0]<http://www.gmv.com/blog_gmv/language/en/> P Please consider the environment before printing this e-mail. ______________________ This message including any attachments may contain confidential information, according to our Information Security Management System, and intended solely for a specific individual to whom they are addressed. Any unauthorised copy, disclosure or distribution of this message is strictly forbidden. If you have received this transmission in error, please notify the sender immediately and delete it. ______________________ Este mensaje, y en su caso, cualquier fichero anexo al mismo, puede contener informacion clasificada por su emisor como confidencial en el marco de su Sistema de Gestion de Seguridad de la Informacion siendo para uso exclusivo del destinatario, quedando prohibida su divulgacion copia o distribucion a terceros sin la autorizacion expresa del remitente. Si Vd. ha recibido este mensaje erroneamente, se ruega lo notifique al remitente y proceda a su borrado. Gracias por su colaboracion. ______________________

4 6

[U-Boot] [ANN] U-Boot v2018.05 released
by Tom Rini 09 Jun '18

09 Jun '18

Hey all, It's release day, and here we are doing the release. It's live on git and FTP and ACD (along with the PGP sig file). A few things I want to call out here. First, a bunch more NXP PowerPC boards have just been marked as Orphaned due to lack of valid maintainer email. So the one year until removal clock has started for them. This also marks the point where another batch of boards will hit the 1 year mark with the _next_ release and I'm inclined to say that what that means is that _this_ is the final release they will be in. Second, logo! We've never officially had a logo and I've made some half-hearted attempts over the years to find someone to do one. Thanks to Alexander Graf and now Heinrich Schuchardt we have one in-progress and at: https://www.xypron.de/projects/u-boot/images/Circle-icons-submarine-orange-… Please provide any serious feedback on this, preferably in the current thread titled "Logo for U-Boot". I'd like to grab the new logo and use it for both conference things and for a default framebuffer logo (tools/logo/) for v2018.07-rc1. Finally, SPDX tags. Now that the Linux Kernel is using them and has all of documentation, tooling and user expectations around it, we have switched over to that style formatting for tags. All existing files have been converted and for new files checkpatch has already been warning about them if they're in the wrong format. The only outstanding thing now is to adapt the kernel document about where/how/why to U-Boot, and since that is not a direct drop-in I didn't include it in this release but will instead be posting a patch in the next day or two to update our Licenses/README to reflect both style and include the longer reasoning, explanation, etc. Thanks all! -- Tom

2 2

[U-Boot] [PATCH] fit: Enable fitImage by default if OF_LIBFDT is enabled
by Marek Vasut 09 Jun '18

09 Jun '18

Enable fitImage by default on systems which already use libfdt. The fitImage has many benefits over zImage and supersedes legacy uImage, so enable it by default where possible to make it widely available. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Maxime Ripard <maxime.ripard(a)bootlin.com> Cc: Michal Simek <michal.simek(a)xilinx.com> Cc: Tom Rini <trini(a)konsulko.com> --- NOTE: And make my life easier, so that every contemporary board I look at supports a civilized contemporary boot image format and I don't have to mess around to find the right combo of zImage or uImage and DTB and the right load addresses and keep loading gazilion of files every time I boot a board. --- Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/Kconfig b/Kconfig index 9fd9de1772..7e0c736027 100644 --- a/Kconfig +++ b/Kconfig @@ -223,6 +223,7 @@ config FIT bool "Support Flattened Image Tree" select MD5 select SHA1 + default y if OF_LIBFDT help This option allows you to boot the new uImage structure, Flattened Image Tree. FIT is formally a FDT, which can include -- 2.16.2

2 3

[U-Boot] [PATCH 1/3] board: Kconfig: Re-Arrangement of PPA firmware and header addresses
by Bhaskar Upadhaya 09 Jun '18

09 Jun '18

ppa firmware and header address may vary depending upon different boards, configure ppa firmware and header address in board specific kconfig Signed-off-by: Vinitha V Pillai <vinitha.pillai(a)nxp.com> Signed-off-by: Jagdish Gediya <jagdish.gediya(a)nxp.com> Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya(a)nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 34 ------------------------------- board/freescale/ls1012afrdm/Kconfig | 4 ++++ board/freescale/ls1012aqds/Kconfig | 3 +++ board/freescale/ls1012ardb/Kconfig | 14 +++++++++++++ board/freescale/ls1043aqds/Kconfig | 16 +++++++++++++++ board/freescale/ls1043ardb/Kconfig | 14 +++++++++++++ board/freescale/ls1046aqds/Kconfig | 16 +++++++++++++++ board/freescale/ls1046ardb/Kconfig | 15 ++++++++++++++ board/freescale/ls1088a/Kconfig | 28 +++++++++++++++++++++++++ board/freescale/ls2080aqds/Kconfig | 16 +++++++++++++++ board/freescale/ls2080ardb/Kconfig | 31 ++++++++++++++-------------- 11 files changed, 141 insertions(+), 50 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 546de33..f2111fa 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -261,40 +261,6 @@ config SYS_LS_PPA_FW_IN_NAND endchoice -config SYS_LS_PPA_FW_ADDR - hex "Address of PPA firmware loading from" - depends on FSL_LS_PPA - default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT && ARCH_LS2080A - default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT - default 0x580400000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A - default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1088A - default 0x60400000 if SYS_LS_PPA_FW_IN_XIP - default 0x400000 if SYS_LS_PPA_FW_IN_MMC - default 0x400000 if SYS_LS_PPA_FW_IN_NAND - - help - If the PPA firmware locate at XIP flash, such as NOR or - QSPI flash, this address is a directly memory-mapped. - If it is in a serial accessed flash, such as NAND and SD - card, it is a byte offset. - -config SYS_LS_PPA_ESBC_ADDR - hex "hdr address of PPA firmware loading from" - depends on FSL_LS_PPA && CHAIN_OF_TRUST - default 0x60680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A - default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A - default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A - default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT && ARCH_LS2080A - default 0x580680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A - default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1088A - default 0x680000 if SYS_LS_PPA_FW_IN_MMC - default 0x680000 if SYS_LS_PPA_FW_IN_NAND - help - If the PPA header firmware locate at XIP flash, such as NOR or - QSPI flash, this address is a directly memory-mapped. - If it is in a serial accessed flash, such as NAND and SD - card, it is a byte offset. - config LS_PPA_ESBC_HDR_SIZE hex "Length of PPA ESBC header" depends on FSL_LS_PPA && CHAIN_OF_TRUST && !SYS_LS_PPA_FW_IN_XIP diff --git a/board/freescale/ls1012afrdm/Kconfig b/board/freescale/ls1012afrdm/Kconfig index 22d521b..fd33807 100644 --- a/board/freescale/ls1012afrdm/Kconfig +++ b/board/freescale/ls1012afrdm/Kconfig @@ -12,6 +12,10 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1012afrdm" +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x40400000 + if FSL_PFE config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/freescale/ls1012aqds/Kconfig b/board/freescale/ls1012aqds/Kconfig index c0b12ed..b702fb2 100644 --- a/board/freescale/ls1012aqds/Kconfig +++ b/board/freescale/ls1012aqds/Kconfig @@ -12,6 +12,9 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1012aqds" +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x40400000 if FSL_PFE diff --git a/board/freescale/ls1012ardb/Kconfig b/board/freescale/ls1012ardb/Kconfig index 493d477..4cd66bd 100644 --- a/board/freescale/ls1012ardb/Kconfig +++ b/board/freescale/ls1012ardb/Kconfig @@ -12,6 +12,16 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1012ardb" +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x40400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 +endif + if FSL_PFE config BOARD_SPECIFIC_OPTIONS # dummy @@ -59,6 +69,10 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1012a2g5rdb" +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x40400000 + if FSL_PFE config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/freescale/ls1043aqds/Kconfig b/board/freescale/ls1043aqds/Kconfig index 95d2888..182900e 100644 --- a/board/freescale/ls1043aqds/Kconfig +++ b/board/freescale/ls1043aqds/Kconfig @@ -12,6 +12,22 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1043aqds" +if FSL_LS_PPA +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + default 0x60400000 if SYS_LS_PPA_FW_IN_XIP + default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + default 0x60680000 if SYS_LS_PPA_FW_IN_XIP + default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND +endif +endif + source "board/freescale/common/Kconfig" endif diff --git a/board/freescale/ls1043ardb/Kconfig b/board/freescale/ls1043ardb/Kconfig index 1bab7ca..3d9e295 100644 --- a/board/freescale/ls1043ardb/Kconfig +++ b/board/freescale/ls1043ardb/Kconfig @@ -22,6 +22,20 @@ config SYS_HAS_ARMV8_SECURE_BASE If enabled, please also define the value for ARMV8_SECURE_BASE, for LS1043ARDB, it could be some address in OCRAM. +if FSL_LS_PPA +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x60400000 if SYS_LS_PPA_FW_IN_XIP + default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x60680000 if SYS_LS_PPA_FW_IN_XIP + default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND +endif +endif + source "board/freescale/common/Kconfig" endif diff --git a/board/freescale/ls1046aqds/Kconfig b/board/freescale/ls1046aqds/Kconfig index 070827d..1616dcc 100644 --- a/board/freescale/ls1046aqds/Kconfig +++ b/board/freescale/ls1046aqds/Kconfig @@ -12,6 +12,22 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1046aqds" +if FSL_LS_PPA +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + default 0x60400000 if SYS_LS_PPA_FW_IN_XIP + default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + default 0x60680000 if SYS_LS_PPA_FW_IN_XIP + default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND +endif +endif + source "board/freescale/common/Kconfig" endif diff --git a/board/freescale/ls1046ardb/Kconfig b/board/freescale/ls1046ardb/Kconfig index b9f2ed7..4c31e0e 100644 --- a/board/freescale/ls1046ardb/Kconfig +++ b/board/freescale/ls1046ardb/Kconfig @@ -12,5 +12,20 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1046ardb" + +if FSL_LS_PPA +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x40400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND +endif +endif + source "board/freescale/common/Kconfig" endif diff --git a/board/freescale/ls1088a/Kconfig b/board/freescale/ls1088a/Kconfig index 4479dd0..8bb828e 100644 --- a/board/freescale/ls1088a/Kconfig +++ b/board/freescale/ls1088a/Kconfig @@ -12,6 +12,20 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1088aqds" +if FSL_LS_PPA +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x20400000 if SYS_LS_PPA_FW_IN_XIP + default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 if SYS_LS_PPA_FW_IN_XIP + default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND +endif +endif + source "board/freescale/common/Kconfig" endif @@ -29,5 +43,19 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls1088ardb" +if FSL_LS_PPA +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x20400000 if SYS_LS_PPA_FW_IN_XIP + default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 if SYS_LS_PPA_FW_IN_XIP + default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND +endif +endif + source "board/freescale/common/Kconfig" endif diff --git a/board/freescale/ls2080aqds/Kconfig b/board/freescale/ls2080aqds/Kconfig index e2b2c8d..6b2b645 100644 --- a/board/freescale/ls2080aqds/Kconfig +++ b/board/freescale/ls2080aqds/Kconfig @@ -13,6 +13,22 @@ config SYS_SOC config SYS_CONFIG_NAME default "ls2080aqds" +if FSL_LS_PPA +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + default 0x580400000 if SYS_LS_PPA_FW_IN_XIP + default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + default 0x580680000 if SYS_LS_PPA_FW_IN_XIP + default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND +endif +endif + source "board/freescale/common/Kconfig" endif diff --git a/board/freescale/ls2080ardb/Kconfig b/board/freescale/ls2080ardb/Kconfig index 8f64642..678d582 100644 --- a/board/freescale/ls2080ardb/Kconfig +++ b/board/freescale/ls2080ardb/Kconfig @@ -1,5 +1,4 @@ - -if TARGET_LS2080ARDB +if TARGET_LS2080ARDB || TARGET_LS2081ARDB config SYS_BOARD default "ls2080ardb" @@ -15,21 +14,21 @@ config SYS_CONFIG_NAME source "board/freescale/common/Kconfig" +if FSL_LS_PPA +config SYS_LS_PPA_FW_ADDR + hex "PPA Firmware Addr" + default 0x20400000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + default 0x580400000 if SYS_LS_PPA_FW_IN_XIP + default 0x400000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + default 0x580680000 if SYS_LS_PPA_FW_IN_XIP + default 0x680000 if SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND +endif endif - -if TARGET_LS2081ARDB - -config SYS_BOARD - default "ls2080ardb" - -config SYS_VENDOR - default "freescale" - -config SYS_SOC - default "fsl-layerscape" - -config SYS_CONFIG_NAME - default "ls2080ardb" source "board/freescale/common/Kconfig" -- 1.9.1

2 6

[U-Boot] [PATCH] arm: ls1021aqds: config: enable CONFIG_ID_EEPROM for mac command
by Jagdish Gediya 09 Jun '18

09 Jun '18

Signed-off-by: Jagdish Gediya <jagdish.gediya(a)nxp.com> --- include/configs/ls1021aqds.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 0b4a6a4..79a84c4 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -351,6 +351,15 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ +/* EEPROM */ +#define CONFIG_ID_EEPROM +#define CONFIG_SYS_I2C_EEPROM_NXID +#define CONFIG_SYS_EEPROM_BUS_NUM 0 +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x57 +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 +#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 + /* * I2C bus multiplexer */ -- 2.7.4

2 1

[U-Boot] [PATCH] board/freescale,lsch3: Add entry for 0.9v
by Priyanka Jain 09 Jun '18

09 Jun '18

As per updated hardware documentation for lsch3 based chips like LS2088A, 0.9v support has been added in possible supported SoC volatges Signed-off-by: Priyanka Jain <priyanka.jain(a)nxp.com> --- board/freescale/common/vid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c index 0476f24..eb5cf88 100644 --- a/board/freescale/common/vid.c +++ b/board/freescale/common/vid.c @@ -428,7 +428,7 @@ int adjust_vdd(ulong vdd_override) 0, /* reserved */ 0, /* reserved */ 0, /* reserved */ - 0, /* reserved */ + 9000, /* reserved */ 0, /* reserved */ 0, /* reserved */ 0, /* reserved */ -- 1.9.1

2 1

[U-Boot] [PATCH] net: mvgbe: extract common code for SMI wait
by Chris Packham 08 Jun '18

08 Jun '18

Combine repeated code from smi_reg_read/smi_reg_write into a common function smi_wait_ready. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- drivers/net/mvgbe.c | 48 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index 4e1aff6e3a86..ca91897fdd14 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -40,10 +40,26 @@ DECLARE_GLOBAL_DATA_PTR; #define MVGBE_SMI_REG (((struct mvgbe_registers *)MVGBE0_BASE)->smi) #if defined(CONFIG_PHYLIB) || defined(CONFIG_MII) || defined(CONFIG_CMD_MII) +static int smi_wait_ready(struct mvgbe_device *dmvgbe) +{ + u32 timeout = MVGBE_PHY_SMI_TIMEOUT; + u32 smi_reg; + + do { + smi_reg = MVGBE_REG_RD(MVGBE_SMI_REG); + if (timeout-- == 0) { + printf("Error: SMI busy timeout\n"); + return -EFAULT; + } + } while (smi_reg & MVGBE_PHY_SMI_BUSY_MASK); + + return 0; +} + /* * smi_reg_read - miiphy_read callback function. * - * Returns 16bit phy register value, or 0xffff on error + * Returns 16bit phy register value, or -EFAULT on error */ static int smi_reg_read(struct mii_dev *bus, int phy_adr, int devad, int reg_ofs) @@ -74,16 +90,9 @@ static int smi_reg_read(struct mii_dev *bus, int phy_adr, int devad, return -EFAULT; } - timeout = MVGBE_PHY_SMI_TIMEOUT; /* wait till the SMI is not busy */ - do { - /* read smi register */ - smi_reg = MVGBE_REG_RD(MVGBE_SMI_REG); - if (timeout-- == 0) { - printf("Err..(%s) SMI busy timeout\n", __func__); - return -EFAULT; - } - } while (smi_reg & MVGBE_PHY_SMI_BUSY_MASK); + if (smi_wait_ready(dmvgbe) < 0) + return -EFAULT; /* fill the phy address and regiser offset and read opcode */ smi_reg = (phy_adr << MVGBE_PHY_SMI_DEV_ADDR_OFFS) @@ -119,10 +128,9 @@ static int smi_reg_read(struct mii_dev *bus, int phy_adr, int devad, } /* - * smi_reg_write - imiiphy_write callback function. + * smi_reg_write - miiphy_write callback function. * - * Returns 0 if write succeed, -EINVAL on bad parameters - * -ETIME on timeout + * Returns 0 if write succeed, -EFAULT on error */ static int smi_reg_write(struct mii_dev *bus, int phy_adr, int devad, int reg_ofs, u16 data) @@ -131,7 +139,6 @@ static int smi_reg_write(struct mii_dev *bus, int phy_adr, int devad, struct mvgbe_device *dmvgbe = to_mvgbe(dev); struct mvgbe_registers *regs = dmvgbe->regs; u32 smi_reg; - u32 timeout; /* Phyadr write request*/ if (phy_adr == MV_PHY_ADR_REQUEST && @@ -147,19 +154,12 @@ static int smi_reg_write(struct mii_dev *bus, int phy_adr, int devad, } if (reg_ofs > PHYREG_MASK) { printf("Err..(%s) Invalid register offset\n", __func__); - return -EINVAL; + return -EFAULT; } /* wait till the SMI is not busy */ - timeout = MVGBE_PHY_SMI_TIMEOUT; - do { - /* read smi register */ - smi_reg = MVGBE_REG_RD(MVGBE_SMI_REG); - if (timeout-- == 0) { - printf("Err..(%s) SMI busy timeout\n", __func__); - return -ETIME; - } - } while (smi_reg & MVGBE_PHY_SMI_BUSY_MASK); + if (smi_wait_ready(dmvgbe) < 0) + return -EFAULT; /* fill the phy addr and reg offset and write opcode and data */ smi_reg = (data << MVGBE_PHY_SMI_DATA_OFFS); -- 2.17.0

3 2

[U-Boot] [PATCHv2] block: Have BLOCK_CACHE default to y in some cases
by Tom Rini 08 Jun '18

08 Jun '18

When dealing with filesystems that come from block devices we can get a noticeable performance gain in some use cases from having the block cache enabled. The code paths are valid in other cases when we have BLK set and may provide wins in raw reads in some use cases, so have this be default when BLK is enabled. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Changes in v2: - Make this default y, unconditionally but depend on BLK which is required for the functionality to be used. --- drivers/block/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 15fd1bcb2b7e..0792373cfc48 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -29,7 +29,8 @@ config SPL_BLK config BLOCK_CACHE bool "Use block device cache" - default n + depends on BLK + default y help This option enables a disk-block cache for all block devices. This is most useful when accessing filesystems under U-Boot since -- 2.7.4

2 5