April 2019 - U-Boot

[U-Boot] [PATCH 1/1] efi_selftest: do not run FDT test with ACPI table.
by Heinrich Schuchardt 22 Apr '19

22 Apr '19

The EBBR specification prescribes that we should have either an ACPI table or a device tree but not both. So do not run the device tree unit test on boards with an ACPI table. Hence there is no need any longer to make it 'on request' only. Do not pass $fdtcontroladdr to `bootefi selftest`. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_selftest/Makefile | 4 +++ lib/efi_selftest/efi_selftest_fdt.c | 41 +++++++++++++++++++++-------- test/py/tests/test_efi_selftest.py | 3 ++- 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/lib/efi_selftest/Makefile b/lib/efi_selftest/Makefile index c9720c9da8..fb82e71976 100644 --- a/lib/efi_selftest/Makefile +++ b/lib/efi_selftest/Makefile @@ -42,6 +42,10 @@ efi_selftest_watchdog.o obj-$(CONFIG_CPU_V7) += efi_selftest_unaligned.o obj-$(CONFIG_EFI_LOADER_HII) += efi_selftest_hii.o +ifeq ($(CONFIG_GENERATE_ACPI_TABLE),) +obj-y += efi_selftest_fdt.o +endif + ifeq ($(CONFIG_BLK)$(CONFIG_PARTITIONS),yy) obj-y += efi_selftest_block_device.o endif diff --git a/lib/efi_selftest/efi_selftest_fdt.c b/lib/efi_selftest/efi_selftest_fdt.c index d545d51812..94d72d3f6d 100644 --- a/lib/efi_selftest/efi_selftest_fdt.c +++ b/lib/efi_selftest/efi_selftest_fdt.c @@ -13,13 +13,15 @@ #include <efi_selftest.h> #include <linux/libfdt.h> -static struct efi_boot_services *boottime; +static const struct efi_system_table *systemtab; +static const struct efi_boot_services *boottime; static const char *fdt; /* This should be sufficient for */ #define BUFFERSIZE 0x100000 -static efi_guid_t fdt_guid = EFI_FDT_GUID; +static const efi_guid_t fdt_guid = EFI_FDT_GUID; +static const efi_guid_t acpi_guid = EFI_ACPI_TABLE_GUID; /* * Convert FDT value to host endianness. @@ -115,6 +117,23 @@ static char *get_property(const u16 *property) } } +/** + * efi_st_get_config_table() - get configuration table + * + * @guid: GUID of the configuration table + * Return: pointer to configuration table or NULL + */ +static void *efi_st_get_config_table(const efi_guid_t *guid) +{ + size_t i; + + for (i = 0; i < systab.nr_tables; i++) { + if (!guidcmp(guid, &systemtab->tables[i].guid)) + return systemtab->tables[i].table; + } + return NULL; +} + /* * Setup unit test. * @@ -125,21 +144,22 @@ static char *get_property(const u16 *property) static int setup(const efi_handle_t img_handle, const struct efi_system_table *systable) { - efi_uintn_t i; + void *acpi; + systemtab = systable; boottime = systable->boottime; - /* Find configuration tables */ - for (i = 0; i < systable->nr_tables; ++i) { - if (!efi_st_memcmp(&systable->tables[i].guid, &fdt_guid, - sizeof(efi_guid_t))) - fdt = systable->tables[i].table; - } + acpi = efi_st_get_config_table(&acpi_guid); + fdt = efi_st_get_config_table(&fdt_guid); + if (!fdt) { efi_st_error("Missing device tree\n"); return EFI_ST_FAILURE; } - + if (acpi) { + efi_st_error("Found ACPI table and device tree\n"); + return EFI_ST_FAILURE; + } return EFI_ST_SUCCESS; } @@ -183,5 +203,4 @@ EFI_UNIT_TEST(fdt) = { .phase = EFI_EXECUTE_BEFORE_BOOTTIME_EXIT, .setup = setup, .execute = execute, - .on_request = true, }; diff --git a/test/py/tests/test_efi_selftest.py b/test/py/tests/test_efi_selftest.py index bc226a8e63..07e4db0452 100644 --- a/test/py/tests/test_efi_selftest.py +++ b/test/py/tests/test_efi_selftest.py @@ -15,7 +15,7 @@ def test_efi_selftest(u_boot_console): This function executes all selftests that are not marked as on request. """ u_boot_console.run_command(cmd='setenv efi_selftest') - u_boot_console.run_command(cmd='bootefi selftest ${fdtcontroladdr}', wait_for_prompt=False) + u_boot_console.run_command(cmd='bootefi selftest', wait_for_prompt=False) m = u_boot_console.p.expect(['Summary: 0 failures', 'Press any key']) if m != 0: raise Exception('Failures occurred during the EFI selftest') @@ -27,6 +27,7 @@ def test_efi_selftest(u_boot_console): @pytest.mark.buildconfigspec('cmd_bootefi_selftest') @pytest.mark.buildconfigspec('of_control') +(a)pytest.mark.notbuildconfigspec('generate_acpi_table') def test_efi_selftest_device_tree(u_boot_console): u_boot_console.run_command(cmd='setenv efi_selftest list') output = u_boot_console.run_command('bootefi selftest') -- 2.20.1

1 0

[U-Boot] Fwd: EFIBootGuard for CIP and SecureBoot
by Heinrich Schuchardt 22 Apr '19

22 Apr '19

-------- Forwarded Message -------- Subject: Re: EFIBootGuard for CIP and SecureBoot Date: Mon, 22 Apr 2019 19:55:04 +0200 From: Heinrich Schuchardt <xypron.glpk(a)gmx.de> On Fri Apr 19 10:48:51 UTC 2019 François Ozog <francois.ozog(a)linaro.org> wrote > We will be conducting a UEFI gap analysis to support EFIBootGuard in > U-Boot. > > As we are working on UEFI SecureBoot implementation in U-Boot, how do > you expect the boot process to be secured? Would U-Boot UEFI > SecureBoot verify EFIBootGuard signature and in turn EFIBootGuard will > check either grub or Linux signature? > > Please elaborate on your vision of a secured boot process. The UEFI spec is quite clear about this: An implementation of SecureBoot will check the signature of any EFI binary before starting it. StartImage() will return EFI_SECURITY_VIOLATION when trying to start an image that is neither correctly signed nor whose hash is known. As we use StartImage() for starting any image the signature of EFIBootGuard would be checked first and then any of the child applications it starts. You will not be able to start GRUB or the Linux kernel if their signature are not added to U-Boot's key database. Of cause you could implement inside EFIBootGuard your own mechanism to start a loaded image without calling StartImage(). In this case U-Boot cannot protect you from invalid images. Best regards Heinrich

1 0

[U-Boot] [PATCH v3] arm: socfpga: mailbox: Fix off-by-one error on command length checking
by Ley Foon Tan 22 Apr '19

22 Apr '19

A mailbox command contains 1-DWORD header + arguments. The "len" variable only contains the length of the arguments, but not the 1-DWORD header. Include the length of header when checking the ring buffer space to prevent off-by-one error. Signed-off-by: Ley Foon Tan <ley.foon.tan(a)intel.com> Signed-off-by: Chee Hong Ang <chee.hong.ang(a)intel.com> --- v2->v3: - Update commit description. --- arch/arm/mach-socfpga/mailbox_s10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c index 3c33223936..8363c93e90 100644 --- a/arch/arm/mach-socfpga/mailbox_s10.c +++ b/arch/arm/mach-socfpga/mailbox_s10.c @@ -59,7 +59,7 @@ static __always_inline int mbox_fill_cmd_circular_buff(u32 header, u32 len, */ if (((cin + 1) % MBOX_CMD_BUFFER_SIZE) == cout || ((MBOX_CMD_BUFFER_SIZE - cin + cout - 1) % - MBOX_CMD_BUFFER_SIZE) < len) + MBOX_CMD_BUFFER_SIZE) < (len + 1)) return -ENOMEM; /* write header to circular buffer */ -- 2.19.0

4 5

[U-Boot] [PATCH] spl: avoid printf when we might be doing Ymodem with CONFIG_SPL_FIT_SIGNATURE
by Alex Kiernan 22 Apr '19

22 Apr '19

If CONFIG_SPL_FIT_SIGNATURE is enabled and U-Boot is being loaded from UART over Ymodem then we can't emit messages using printf() without causing errors like: Sending: u-boot-dtb.img Ymodem sectors/kbytes sent: 3009/376kRetry 0: Got 23 for sector ACK Retry 0: NAK on sector Retry 0: Got 68 for sector ACK Retry 0: NAK on sector Ymodem sectors/kbytes sent: 3273/409kRetry 0: Got 23 for sector ACK Retry 0: NAK on sector Retry 0: Got 68 for sector ACK Retry 0: NAK on sector Use debug() rather than printf() to avoid sending messages on the serial port. Signed-off-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- common/spl/spl_fit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index db436268cbcd..08faf2c1b058 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -240,12 +240,12 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector, } #ifdef CONFIG_SPL_FIT_SIGNATURE - printf("## Checking hash(es) for Image %s ... ", - fit_get_name(fit, node, NULL)); + debug("## Checking hash(es) for Image %s ... ", + fit_get_name(fit, node, NULL)); if (!fit_image_verify_with_data(fit, node, src, length)) return -EPERM; - puts("OK\n"); + debug("OK\n"); #endif #ifdef CONFIG_SPL_FIT_IMAGE_POST_PROCESS -- 2.17.1

3 5

[U-Boot] [PATCH v2] env: Update env_addr for mmc environment driver
by Pankit Garg 22 Apr '19

22 Apr '19

Signed-off-by: Pankit Garg <pankit.garg(a)nxp.com> --- Changes for v2: - Remove CRC calculation as it is already part of env_import - Update env_addr after env_import env/mmc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/env/mmc.c b/env/mmc.c index c3cf35d..d329bea 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -313,6 +313,7 @@ static int env_mmc_load(void) int ret; int dev = mmc_get_env_dev(); const char *errmsg; + env_t *ep = NULL; mmc = find_mmc_device(dev); @@ -334,6 +335,10 @@ static int env_mmc_load(void) } ret = env_import(buf, 1); + if (!ret) { + ep = (env_t *)buf; + gd->env_addr = (ulong)&(ep->data); + } fini: fini_mmc_for_env(mmc); -- 1.9.1

2 1

[U-Boot] doing anything about "bad" Kbuild configuration options?
by Robert P. J. Day 22 Apr '19

22 Apr '19

only a few months ago, i jumped into a discussion regarding Kbuild config options that were defined in some Kconfig* file, but were unused anywhere in the source tree: http://u-boot.10912.n7.nabble.com/policy-regarding-unused-code-td351802.htm… many years ago, i wrote a script to locate such entries in the linux kernel source tree and, once u-boot adoopted the Kbuild build system, i could obviously use the same script on the u-boot source -- so far, so good. but i wrote some associated scripts to locate other oddities, and one of them was to find what i called "badref" options. now, "unused" options are typically not serious -- a Kbuild option is defined that is simply not tested anywhere in the source. normally, that's because someone removed some source and just forgot to remove the associated Kconfig option. "badref" options, on the other hand, are exactly the opposite -- options that *are* tested somewhere in the code, but are not defined anywhere in a Kconfig file. in short, the code is testing some CONFIG_* option that will never, ever succeed as it isn't defined, which should typically be treated as a potentially more serious issue. i wrote up an example of this here: https://crashcourse.ca/dokuwiki/doku.php?id=u-boot_badref where you can see the result of running the script and asking it to scan the entire u-boot "drivers" directory once upon a time -- the output consists of a string for which the corresponding CONFIG_<string> is being tested somewhere in the argument directory, but for which there is no apparent Kconfig definition; the output for each string consists of a tree-wide search for that string. as an example, note the very first example found: >>>>> ACX517AKN drivers/video/pxa_lcd.c:201:#ifdef CONFIG_ACX517AKN drivers/video/pxa_lcd.c:231:#endif /* CONFIG_ACX517AKN */ drivers/video/pxa_lcd.c:297:#endif /* CONFIG_ACX517AKN */ scripts/config_whitelist.txt:15:CONFIG_ACX517AKN so CONFIG_ACX517AKN is clearly being tested, while there is no definition for that option *anywhere* in the tree. (the script might not be perfect, there might be the occasional false negative or positive, but one can always verify manually if there's any doubt.) one of the worst culprits appears to be CONFIG_SPL_BUILD, which appears all over the tree, but one can see a recent commit that takes that into account: commit 0ef692084363f2de8547db93397c6a69123d26ca Author: Baruch Siach <baruch(a)tkos.co.il> Date: Thu Feb 7 13:21:16 2019 +0200 Kconfig: fix BUILD_TARGET for ARCH_MVEBU Commit dc146ca11187 ("Kconfig: Migrate CONFIG_BUILD_TARGET") made the mvebu default build target depend on CONFIG_SPL_BUILD. Unfortunately, there is no such Kconfig symbol. Use the CONFIG_SPL symbol instead to fix that. Cc: Jagan Teki <jagan(a)amarulasolutions.com> Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> Reviewed-by: Stefan Roese <sr(a)denx.de> Reviewed-by: Jagan Teki <jagan(a)amarulasolutions.com> Signed-off-by: Stefan Roese <sr(a)denx.de> the output for that example in my wiki page is a bit overwhelming, which is why my badref script takes an optional directory to search, so you can focus your attention as finely as you want. as an example, check only drivers/mmc, which appears to find exactly four bad references: $ find_badref_configs.sh drivers/mmc >>>>> HSMMC3_8BIT drivers/mmc/omap_hsmmc.c:1577:#if defined(CONFIG_DRA7XX) && defined(CONFIG_HSMMC3_8BIT) >>>>> MMC_RPMB_TRACE drivers/mmc/rpmb.c:98:#ifdef CONFIG_MMC_RPMB_TRACE drivers/mmc/rpmb.c:115:#ifdef CONFIG_MMC_RPMB_TRACE drivers/mmc/rpmb.c:131:#ifdef CONFIG_MMC_RPMB_TRACE drivers/mmc/rpmb.c:147:#ifdef CONFIG_MMC_RPMB_TRACE drivers/mmc/rpmb.c:154:#ifdef CONFIG_MMC_RPMB_TRACE scripts/config_whitelist.txt:1225:CONFIG_MMC_RPMB_TRACE >>>>> MMC_SPI_CRC_ON drivers/mmc/mmc_spi.c:94:#ifdef CONFIG_MMC_SPI_CRC_ON drivers/mmc/mmc_spi.c:123:#ifdef CONFIG_MMC_SPI_CRC_ON drivers/mmc/mmc.c:2259:#ifdef CONFIG_MMC_SPI_CRC_ON scripts/config_whitelist.txt:1228:CONFIG_MMC_SPI_CRC_ON arch/arm/include/asm/arch-pxa/regs-mmc.h:66:#define MMC_SPI_CRC_ON (1 << 1) >>>>> ZYNQ_HISPD_BROKEN drivers/mmc/zynq_sdhci.c:263:#ifdef CONFIG_ZYNQ_HISPD_BROKEN scripts/config_whitelist.txt:4637:CONFIG_ZYNQ_HISPD_BROKEN $ in any event, i am not planning to do anything about this, i just thought others might want to check whatever part of the code base for which they are a maintainer, and see if any such things exist. and as forrest gump once said, "that's all i have to say about that." rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

3 4

[U-Boot] [PULL] u-boot-usb/master
by Marek Vasut 22 Apr '19

22 Apr '19

The following changes since commit 1f4ae66eaab29bfb5d1eb44996f7826c9cd01ed1: Merge tag 'arc-for-2019.07' of git://git.denx.de/u-boot-arc (2019-04-18 12:12:16 -0400) are available in the Git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 7fd9f31c6bd13609da61b985cf8f5f65ebebd913: usb: dwc2: fix gadget disconnect (2019-04-21 10:26:52 +0200) ---------------------------------------------------------------- Alex Kiernan (3): configs: Migrate USB_MUSB_DISABLE_BULK_COMBINE_SPLIT to Kconfig usb: Select USB_MUSB_DSPS with USB_MUSB_TI fastboot: Replace literal 32 with PART_NAME_LEN Andy Shevchenko (1): dfu: Avoid declaring unused variables and absent parameters Eugeniu Rosca (3): fastboot: getvar: correct/rename "has_slot" to "has-slot" fastboot: Improve error reporting on 'getvar partition-{size, type}' fastboot: add support for 'getvar platform' Fabrice Gasnier (1): usb: dwc2: fix gadget disconnect Patrice Chotard (1): usb: dwc2_udc_otg: Add tx_fifo_sz array support Patrick Delaunay (16): phy: usbphyc: remove unused variable index phy: usbphyc: update xlate with DT binding phy: usbphyc: Binding update of vdda supply phy: usbphyc: move vdda1v1 and vdda1v8 in phy_init phy: usbphyc: increase PLL wait timeout usb: dwc2: remove unused variable regs_otg usb: dwc2: convert driver to DM_USB_GADGET usb: dwc2: force reset assert before to probe the driver usb: dwc2: Add force-b-session-valid support usb: dwc2: Add function for session B check usb: dwc2_udc_otg: Read MAX_HW_ENDPOINT from HWCFG4 register usb: dwc2: add support for STM32MP1 stm32mp1: remove CONFIG_USB_DWC2, HOST support for USBO stm32mp1: migrate USBOTG device to driver model stm32mp1: add stusb1600 support for DK1 and DK2 board usb: reload watchdog during ums command arch/arm/dts/stm32mp157-pinctrl.dtsi | 7 +++ arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 3 +- arch/arm/dts/stm32mp157a-dk1.dts | 34 +++++++++++- arch/arm/dts/stm32mp157c-ed1.dts | 8 --- arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi | 1 + arch/arm/dts/stm32mp157c.dtsi | 5 +- board/st/stm32mp1/stm32mp1.c | 185 ++++++++++++++++++----------------------------------------------- cmd/dfu.c | 3 ++ cmd/usb_mass_storage.c | 3 ++ configs/am335x_boneblack_vboot_defconfig | 1 - configs/am335x_evm_defconfig | 1 - configs/am335x_hs_evm_defconfig | 1 - configs/am335x_hs_evm_uart_defconfig | 1 - configs/brppt1_mmc_defconfig | 1 - configs/brppt1_nand_defconfig | 1 - configs/brppt1_spi_defconfig | 1 - configs/chiliboard_defconfig | 1 - configs/stm32mp15_basic_defconfig | 2 +- configs/stm32mp15_trusted_defconfig | 2 +- doc/device-tree-bindings/phy/phy-stm32-usbphyc.txt | 4 +- doc/device-tree-bindings/usb/dwc2.txt | 58 +++++++++++++++++++++ drivers/fastboot/fb_getvar.c | 16 +++++- drivers/fastboot/fb_mmc.c | 10 ++-- drivers/phy/phy-stm32-usbphyc.c | 111 ++++++++++++++++++++------------------- drivers/usb/gadget/dwc2_udc_otg.c | 388 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- drivers/usb/gadget/dwc2_udc_otg_priv.h | 1 - drivers/usb/gadget/dwc2_udc_otg_regs.h | 37 ++++++++++--- drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 14 ++++- drivers/usb/musb-new/Kconfig | 10 ++++ include/configs/am335x_evm.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/brppt1.h | 3 -- include/configs/brxre1.h | 3 -- include/configs/chiliboard.h | 1 - include/configs/pengwyn.h | 1 - include/configs/siemens-am33x-common.h | 2 - include/usb/dwc2_udc.h | 7 +++ scripts/config_whitelist.txt | 1 - 39 files changed, 680 insertions(+), 251 deletions(-) create mode 100644 doc/device-tree-bindings/usb/dwc2.txt

2 1

[U-Boot] [PULL] u-boot-socfpga/master
by Marek Vasut 22 Apr '19

22 Apr '19

The following changes since commit 75ce8c938d39bd22460be66e6bf318bd2410c17b: Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx (2019-04-15 07:31:14 -0400) are available in the Git repository at: git://git.denx.de/u-boot-socfpga.git master for you to fetch changes up to e09c1a133155724d3369e150f3ab7b63c875101c: timer: dw-apb: Add missing 64bit up-conversion (2019-04-17 22:20:18 +0200) ---------------------------------------------------------------- Ley Foon Tan (7): ddr: altera: stratix10: Move SDRAM size check to SDRAM driver ddr: altera: Stratix10: Add multi-banks DRAM size check configs: stratix10: Change CONFIG_NR_DRAM_BANKS to 2 arm: dts: Stratix10: Modify stratix10 socdk memory node arm: socfpga: stratix10: Add cpu_has_been_warmreset() ddr: altera: Stratix10: Add ECC memory scrubbing arm: dts: Stratix10: Add QSPI node Marek Vasut (1): timer: dw-apb: Add missing 64bit up-conversion Simon Goldschmidt (9): arm: socfpga: gen5: sync devicetrees to Linux arm: socfpga: gen5: add reset & sdr node to SPL devicetrees reset: socfpga: rename membase ptr to modrst_base arm: socfpga: gen5: deassert peripheral reset by default reset: socfpga: add reset handling for old kernels arm: socfpga: move gen5 SDR driver to DM mtd: rawnand: denali: add reset handling spi: cadence_qspi: add reset handling arm: socfpga: implement proper peripheral reset arch/arm/dts/socfpga-common-u-boot.dtsi | 19 ++++++++++++++++++ arch/arm/dts/socfpga.dtsi | 23 ++++++++++++++++++---- arch/arm/dts/socfpga_arria5_socdk-u-boot.dtsi | 6 ++---- arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts | 5 +---- arch/arm/dts/socfpga_cyclone5_de0_nano_soc-u-boot.dtsi | 6 ++---- arch/arm/dts/socfpga_cyclone5_de10_nano.dts | 5 +---- arch/arm/dts/socfpga_cyclone5_de1_soc.dts | 5 +---- arch/arm/dts/socfpga_cyclone5_is1.dts | 5 +---- arch/arm/dts/socfpga_cyclone5_socdk-u-boot.dtsi | 6 ++---- arch/arm/dts/socfpga_cyclone5_sockit-u-boot.dtsi | 6 ++---- arch/arm/dts/socfpga_cyclone5_socrates-u-boot.dtsi | 6 ++---- arch/arm/dts/socfpga_cyclone5_socrates.dts | 2 -- arch/arm/dts/socfpga_cyclone5_sr1500.dts | 5 +---- arch/arm/dts/socfpga_cyclone5_vining_fpga-u-boot.dtsi | 6 ++---- arch/arm/dts/socfpga_stratix10.dtsi | 13 ++++++++++++ arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 25 +++++++++++++++++++++++ arch/arm/dts/socfpga_stratix10_socdk.dts | 39 +++++++++++++++++++++++++++++++++++- arch/arm/mach-socfpga/include/mach/reset_manager_s10.h | 3 +++ arch/arm/mach-socfpga/include/mach/sdram_gen5.h | 4 ---- arch/arm/mach-socfpga/include/mach/sdram_s10.h | 9 +++++++++ arch/arm/mach-socfpga/misc_gen5.c | 10 ---------- arch/arm/mach-socfpga/reset_manager_s10.c | 9 +++++++++ arch/arm/mach-socfpga/spl_gen5.c | 38 ++++++++++------------------------- arch/arm/mach-socfpga/spl_s10.c | 11 ----------- configs/socfpga_stratix10_defconfig | 2 +- drivers/ddr/altera/Kconfig | 2 ++ drivers/ddr/altera/sdram_gen5.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- drivers/ddr/altera/sdram_s10.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- drivers/ddr/altera/sequencer.c | 9 ++++++++- drivers/ddr/altera/sequencer.h | 35 +++++++++++++++++++++++++++++++++ drivers/mtd/nand/raw/denali.h | 2 ++ drivers/mtd/nand/raw/denali_dt.c | 15 ++++++++++++++ drivers/reset/reset-socfpga.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++----- drivers/spi/cadence_qspi.c | 17 ++++++++++++++++ drivers/spi/cadence_qspi.h | 4 ++++ drivers/timer/dw-apb-timer.c | 2 +- include/configs/socfpga_common.h | 1 + 37 files changed, 560 insertions(+), 129 deletions(-) create mode 100644 arch/arm/dts/socfpga-common-u-boot.dtsi mode change 100644 => 100755 arch/arm/dts/socfpga_stratix10.dtsi create mode 100755 arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi mode change 100644 => 100755 arch/arm/dts/socfpga_stratix10_socdk.dts

2 1

[U-Boot] [PATCH v2 1/1] Set environment location to ENVL_NOWHERE with CONFIG_ENV_IS_NOWHERE.
by Udit Agarwal 22 Apr '19

22 Apr '19

ENVL_NOWHERE is dependent on CONFIG_ENV_IS_NOWHERE and not on CONFIG_CHAIN_OF_TRUST so return ENVL_NOWHERE when CONFIG_ENV_IS_NOWHERE is enabled Signed-off-by: Udit Agarwal <udit.agarwal(a)nxp.com> --- Changes in V2: Corrects commit message. Removes goto label. arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 34167cdd50..5b945f5959 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -795,12 +795,8 @@ enum env_location env_get_location(enum env_operation op, int prio) if (prio) return ENVL_UNKNOWN; -#ifdef CONFIG_CHAIN_OF_TRUST - /* Check Boot Mode - * If Boot Mode is Secure, return ENVL_NOWHERE - */ - if (fsl_check_boot_mode_secure() == 1) - goto done; +#ifdef CONFIG_ENV_IS_NOWHERE + return env_loc; #endif switch (src) { @@ -830,9 +826,6 @@ enum env_location env_get_location(enum env_operation op, int prio) break; } -#ifdef CONFIG_CHAIN_OF_TRUST -done: -#endif return env_loc; } #endif /* CONFIG_TFABOOT */ -- 2.17.1

2 2

[U-Boot] [PATCH 1/1] common: fdt_support: Check mtdparts cell size
by Stefan Mavrodiev 22 Apr '19

22 Apr '19

When using fdt_fixup_mtdparts() offset and length cell sizes are limited to 4 bytes (1 cell). However if the mtd device is bigger then 4GiB, then #address-cells and #size-cells are 8 bytes (2 cells) [1]. This patch read #size-cells and uses either fdt32_t or fdt64_t cell size. The default is fdt32_t. [1] Documentation/devicetree/bindings/mtd/partition.txt Signed-off-by: Stefan Mavrodiev <stefan(a)olimex.com> --- common/fdt_support.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 42583e3ed8..b0501e12e6 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -724,11 +724,6 @@ int fdt_increase_size(void *fdt, int add_len) #include <jffs2/load_kernel.h> #include <mtd_node.h> -struct reg_cell { - unsigned int r0; - unsigned int r1; -}; - static int fdt_del_subnodes(const void *blob, int parent_offset) { int off, ndepth; @@ -787,15 +782,22 @@ int fdt_node_set_part_info(void *blob, int parent_offset, { struct list_head *pentry; struct part_info *part; - struct reg_cell cell; int off, ndepth = 0; int part_num, ret; + int sizecell; char buf[64]; ret = fdt_del_partitions(blob, parent_offset); if (ret < 0) return ret; + /* + * Check if size/address is 1 or 2 cells. + * We assume #address-cells and #size-cells have same value. + */ + sizecell = fdt_getprop_u32_default_node(blob, parent_offset, + 0, "#size-cells", 1); + /* * Check if it is nand {}; subnode, adjust * the offset in this case @@ -844,10 +846,23 @@ add_ro: goto err_prop; } - cell.r0 = cpu_to_fdt32(part->offset); - cell.r1 = cpu_to_fdt32(part->size); add_reg: - ret = fdt_setprop(blob, newoff, "reg", &cell, sizeof(cell)); + if (sizecell == 2) { + fdt64_t cell[2]; + + cell[0] = cpu_to_fdt64(part->offset); + cell[1] = cpu_to_fdt64(part->size); + ret = fdt_setprop(blob, newoff, + "reg", cell, sizeof(cell)); + } else { + fdt32_t cell[2]; + + cell[0] = cpu_to_fdt32(part->offset); + cell[1] = cpu_to_fdt32(part->size); + ret = fdt_setprop(blob, newoff, + "reg", cell, sizeof(cell)); + } + if (ret == -FDT_ERR_NOSPACE) { ret = fdt_increase_size(blob, 512); if (!ret) -- 2.17.1

2 2