January 2019 - U-Boot

[U-Boot] [PATCH] ihs_video_out: Fix error handling
by Mario Six 28 Jan '19

28 Jan '19

The ihs_video_out driver's error handling is incorrect in two places (one is a missing negation, and in one place a error should be ignored). Fix these two instances. Signed-off-by: Mario Six <mario.six(a)gdsys.cc> --- drivers/video/ihs_video_out.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/ihs_video_out.c b/drivers/video/ihs_video_out.c index 5cdf17aec14..0af7c2bf44a 100644 --- a/drivers/video/ihs_video_out.c +++ b/drivers/video/ihs_video_out.c @@ -238,8 +238,8 @@ int ihs_video_out_probe(struct udevice *dev) int res; res = regmap_init_mem(dev_ofnode(dev), &priv->map); - if (!res) { - debug("%s: Could initialize regmap (err = %d)\n", dev->name, + if (res) { + debug("%s: Could not initialize regmap (err = %d)\n", dev->name, res); return res; } @@ -322,7 +322,7 @@ int ihs_video_out_probe(struct udevice *dev) } res = display_enable(priv->video_tx, 8, &timing); - if (res) { + if (res && res != -EIO) { /* Ignore missing DP sink error */ debug("%s: Could not enable the display (err = %d)\n", dev->name, res); return res; -- 2.20.1

2 1

[U-Boot] [PATCH 1/3] videomodes: Relax EDID validation checks for hsync/vsync pulse width
by Priit Laes 28 Jan '19

28 Jan '19

From: Priit Laes <priit.laes(a)paf.com> Current EDID detailed timing parser errors out when either horizontal or vertical pulse sync width is 0, thus not allowing a display with EDID listed below work properly. Same EDID works ok within Linux although it warns about these two fields being 0. Therefore relax the checks a bit so we can actually use this the screen. Of-course, this is somewhat quirky HDMI display with following anti-features: - HPD pin is not usable - although resolution is 640x480, only top 240 pixels are visible $ xxd -p display.edid 00ffffffffffff0005a1e00301000000150f0103800f05780a0f6ea05748 9a2610474f200000010101010101010101010101010101012a08804520e0 0b1020004000953600000018000000fd0034441a2403000a202020202020 0000001000310a20202020202020202020200000001000002a4030701300 782d1100001e006b $ edid-decode display.edid EDID version: 1.3 Manufacturer: AMA Model 3e0 Serial Number 1 Digital display Maximum image size: 15 cm x 5 cm Gamma: 2.20 RGB color display First detailed timing is preferred timing Display x,y Chromaticity: Red: 0.6250, 0.3398 Green: 0.2841, 0.6044 Blue: 0.1494, 0.0644 White: 0.2802, 0.3105 Established timings supported: 640x480@60Hz 4:3 HorFreq: 31469 Hz Clock: 25.175 MHz Standard timings supported: Detailed mode: Clock 20.900 MHz, 149 mm x 54 mm 640 672 672 709 hborder 0 480 484 484 491 vborder 0 -hsync -vsync VertFreq: 60 Hz, HorFreq: 29478 Hz Monitor ranges (GTF): 52-68Hz V, 26-36kHz H, max dotclock 30MHz Dummy block Dummy block Checksum: 0x6b (valid) Signed-off-by: Priit Laes <priit.laes(a)paf.com> --- drivers/video/videomodes.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c index 74bafff011..1cfeaa980f 100644 --- a/drivers/video/videomodes.c +++ b/drivers/video/videomodes.c @@ -396,9 +396,7 @@ int video_edid_dtd_to_ctfb_res_modes(struct edid_detailed_timing *t, EDID_DETAILED_TIMING_VERTICAL_ACTIVE(*t) == 0 || EDID_DETAILED_TIMING_VERTICAL_BLANKING(*t) == 0 || EDID_DETAILED_TIMING_HSYNC_OFFSET(*t) == 0 || - EDID_DETAILED_TIMING_HSYNC_PULSE_WIDTH(*t) == 0 || EDID_DETAILED_TIMING_VSYNC_OFFSET(*t) == 0 || - EDID_DETAILED_TIMING_VSYNC_PULSE_WIDTH(*t) == 0 || /* 3d formats are not supported*/ EDID_DETAILED_TIMING_FLAG_STEREO(*t) != 0) return -EINVAL; -- 2.11.0

2 1

[U-Boot] [PATCH] imx: video: Fix return value issue
by Ye Li 28 Jan '19

28 Jan '19

When framebuffer driver init is failed, we should return the err value not 0. So the video init can exit immediately. Signed-off-by: Ye Li <ye.li(a)nxp.com> --- arch/arm/mach-imx/video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/video.c b/arch/arm/mach-imx/video.c index b40ce53..953fe53 100644 --- a/arch/arm/mach-imx/video.c +++ b/arch/arm/mach-imx/video.c @@ -7,7 +7,7 @@ int board_video_skip(void) { int i; - int ret; + int ret = 0; char const *panel = env_get("panel"); if (!panel) { @@ -50,7 +50,7 @@ int board_video_skip(void) return -EINVAL; } - return 0; + return ret; } #ifdef CONFIG_IMX_HDMI -- 2.7.4

3 2

[U-Boot] [PATCH v3 0/7] Add USB boot to HS DRA7xx/AM57xx
by Andrew F. Davis 28 Jan '19

28 Jan '19

Hello all, This series adds USB boot support to HS DRA7xx/AM57xx platforms. We start by cleaning up DFU boot in SPL support. What is done in the first patch for DFU, if acceptable, should be done to the other boot modes. The 4th patch is needed as on HS devices a header is added to the boot image that tells the ROM where to load this image. This only works for block device booting as the ROM can read the header and move the image into memory in steps. For streaming boot modes USB/ UART/NET the image is placed in memory as it is received from the media live. This means the header is ignored and the image has a fixed offset in memory. For AM47xx we align the boot modes by making the offset for block device booting the same as the fixed offset for streaming boot modes, in this way only one defconfig is needed. For DRA7xx/AM57xx the signing tools will need to be updated to support specifying this address, when this is done the offset in the base HS defconfig can be moved to match the new offset and the defconfigs added here in patch 5 and 6 can be unified back into the base HS defconfig. The last patch updates the docs for the same above. Thanks, Andrew Changes from v2: - Only use ISW_ENTRY_ADDR for system with a set default Changes from v1: - Drop explicit UART boot support from DRA7xx as this cannot be tested Andrew F. Davis (7): spl: Kconfig: Drop the _SUPPORT postfix from SPL_DFU dfu: Make DFU support more SPL friendly dfu: Remove dependency on HUSH parser in SPL ARM: mach-omap2: Kconfig: Allow OMAP5 devices to set entry point defconfigs: Add config for DRA7xx High Security EVM with USB Boot support defconfigs: Add config for AM57xx High Security EVM with USB/UART Boot support doc: ti-secure: Add ULO info for AM57xx/DRA7xx secure devices from TI MAINTAINERS | 2 + arch/arm/cpu/armv8/zynqmp/spl.c | 2 +- arch/arm/mach-omap2/Kconfig | 15 ++++ arch/arm/mach-omap2/am33xx/Kconfig | 15 ---- arch/arm/mach-omap2/boot-common.c | 2 +- common/Makefile | 3 +- common/cli.c | 2 +- common/spl/Kconfig | 6 +- common/spl/Makefile | 2 +- common/spl/spl_ram.c | 4 +- configs/am57xx_hs_evm_usb_defconfig | 92 ++++++++++++++++++++++++ configs/dra7xx_hs_evm_usb_defconfig | 106 ++++++++++++++++++++++++++++ doc/README.ti-secure | 8 ++- drivers/Makefile | 3 +- drivers/dfu/Makefile | 12 ++-- drivers/usb/gadget/Makefile | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/ti_omap5_common.h | 2 +- include/configs/xilinx_zynqmp.h | 4 +- include/dfu.h | 10 +-- 20 files changed, 248 insertions(+), 46 deletions(-) create mode 100644 configs/am57xx_hs_evm_usb_defconfig create mode 100644 configs/dra7xx_hs_evm_usb_defconfig -- 2.19.1

3 19

[U-Boot] [PATCH 00/26] mx6sabre: Add DM and SPL FIT support
by Abel Vesa 28 Jan '19

28 Jan '19

This comes as a next iteration to the followin RFC: https://lists.denx.de/pipermail/u-boot/2019-January/354834.html Changes since that RFC: * Add all the dl/qp/q dts and dtsi files from linux as suggested by Fabio Estevam * Removed the ENET reset gpio handling from board file since relying on the phy-reset-gpios from imx6qdl-sabresd.dtsi * Reworked the SPL_USB_SUPPORT and renamed it to SPL_USB_STORAGE as suggested by Tom Rini Abel Vesa (26): usb: Rename SPL_USB_SUPPORT to SPL_USB_STORAGE usb: ehci-mx6: Make regulator DM_REGULATOR dependent configs: imx6sabreauto: Add DM_MMC support configs: imx6sabreauto: Add DM_USB support mmc: fsl_esdhc: Fix DM_REGULATOR ifdefs for SPL builds arm: imx: Add board_fit_config_name_match to support FIT in SPL arm: dts: Add devicetree for i.MX6QP arm: dts: Add imx6qdl-sabreauto dtsi file arm: dts: Add imx6qdl-sabresd dtsi file arm: dts: Add all imx6sabre u-boot dtsi files arm: dts: Add imx6q-sabreauto dts file arm: dts: Add imx6q-sabresd dts file arm: dts: Add imx6dl-sabreauto dts file arm: dts: Add imx6dl-sabresd dts file arm: dts: Add imx6qp-sabreauto dts file arm: dts: Add imx6qp-sabresd dts file arm: imx: Add FIT SPL its configs: mx6sabreauto: Add SPL FIT and DM support configs: mx6sabresd: Add SPL FIT and DM support mx6sabreauto: Add DM_GPIO support mx6sabresd: Add DM_GPIO support configs: mx6sabreauto: Add DM_SPI_FLASH necessary configs configs: mx6sabresd: Add DM_SPI_FLASH necessary configs board: mx6sabreauto: Remove the non-DM code board: mx6sabresd: Remove non-DM code board: mx6sabresd: Remove the enet reset gpio handling arch/arm/dts/Makefile | 8 +- arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi | 6 + arch/arm/dts/imx6dl-sabreauto.dts | 17 + arch/arm/dts/imx6dl-sabresd.dts | 17 + arch/arm/dts/imx6q-sabreauto-u-boot.dtsi | 6 + arch/arm/dts/imx6q-sabreauto.dts | 25 ++ arch/arm/dts/imx6q-sabresd-u-boot.dtsi | 6 + arch/arm/dts/imx6q-sabresd.dts | 25 ++ arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi | 14 + arch/arm/dts/imx6qdl-sabreauto.dtsi | 634 ++++++++++++++++++++++++++++ arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi | 14 + arch/arm/dts/imx6qdl-sabresd.dtsi | 623 +++++++++++++++++++++++++++ arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi | 6 + arch/arm/dts/imx6qp-sabreauto.dts | 93 ++++ arch/arm/dts/imx6qp-sabresd.dts | 93 ++++ arch/arm/dts/imx6qp.dtsi | 89 ++++ arch/arm/include/asm/arch-am33xx/spl.h | 2 +- arch/arm/mach-imx/mx6/fit_spl.its | 41 ++ arch/arm/mach-imx/spl.c | 10 + arch/arm/mach-omap2/boot-common.c | 2 +- board/freescale/mx6sabreauto/mx6sabreauto.c | 73 +--- board/freescale/mx6sabresd/mx6sabresd.c | 60 +-- common/Makefile | 5 +- common/spl/Kconfig | 4 +- common/spl/Makefile | 2 +- common/spl/spl_usb.c | 4 - configs/am43xx_evm_usbhost_boot_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- configs/mx6sabreauto_defconfig | 20 +- configs/mx6sabresd_defconfig | 22 +- drivers/mmc/fsl_esdhc.c | 8 +- drivers/usb/host/ehci-mx6.c | 7 +- include/configs/imx6_spl.h | 2 + 33 files changed, 1794 insertions(+), 148 deletions(-) create mode 100644 arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-sabreauto.dts create mode 100644 arch/arm/dts/imx6dl-sabresd.dts create mode 100644 arch/arm/dts/imx6q-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabreauto.dts create mode 100644 arch/arm/dts/imx6q-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabresd.dts create mode 100644 arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabreauto.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabresd.dtsi create mode 100644 arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-sabreauto.dts create mode 100644 arch/arm/dts/imx6qp-sabresd.dts create mode 100644 arch/arm/dts/imx6qp.dtsi create mode 100644 arch/arm/mach-imx/mx6/fit_spl.its -- 2.7.4

3 34

[U-Boot] [PATCH 1/3] PowerPC: Stop re-using CONFIG_SPL_TEXT_BASE for TPL
by Tom Rini 28 Jan '19

28 Jan '19

Rather than checking for CONFIG_TPL_BUILD and then re-defining CONFIG_SPL_TEXT_BASE make use of CONFIG_TPL_TEXT_BASE directly. Cc: York Sun <york.sun(a)nxp.com> Cc: Po Liu <po.liu(a)nxp.com> Cc: Qiang Zhao <qiang.zhao(a)nxp.com> Cc: Timur Tabi <timur(a)tabi.org> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 4 ++++ include/configs/C29XPCIE.h | 6 ++++-- include/configs/P1010RDB.h | 6 ++++-- include/configs/P1022DS.h | 6 ++++-- include/configs/p1_p2_rdb_pc.h | 6 ++++-- scripts/Makefile.spl | 7 +------ 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds index 6dc8d9913b23..bd0eeb104260 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds @@ -18,7 +18,11 @@ PHDRS #endif SECTIONS { +#ifdef CONFIG_TPL_BUILD + . = CONFIG_TPL_TEXT_BASE; +#else . = CONFIG_SPL_TEXT_BASE; +#endif .text : { *(.text*) } diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index caeb34cf0ab8..ebf44b5529c3 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -23,7 +23,7 @@ #define CONFIG_TPL_DRIVERS_MISC_SUPPORT #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SPL_MAX_SIZE (128 << 10) -#define CONFIG_SPL_TEXT_BASE 0xf8f81000 +#define CONFIG_TPL_TEXT_BASE 0xf8f81000 #define CONFIG_SYS_MPC85XX_NO_RESETVEC #define CONFIG_SYS_NAND_U_BOOT_SIZE (832 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST (0x11000000) @@ -50,7 +50,9 @@ #define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc #endif -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_TPL_BUILD +#define CONFIG_SYS_MONITOR_BASE CONFIG_TPL_TEXT_BASE +#elif defined(CONFIG_SPL_BUILD) #define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE #else #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 18f70f04af5f..134ffe52714f 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -78,7 +78,7 @@ #define CONFIG_SPL_NAND_INIT #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SPL_MAX_SIZE (128 << 10) -#define CONFIG_SPL_TEXT_BASE 0xD0001000 +#define CONFIG_TPL_TEXT_BASE 0xD0001000 #define CONFIG_SYS_MPC85XX_NO_RESETVEC #define CONFIG_SYS_NAND_U_BOOT_SIZE (576 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST (0x11000000) @@ -111,7 +111,9 @@ #define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc #endif -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_TPL_BUILD +#define CONFIG_SYS_MONITOR_BASE CONFIG_TPL_TEXT_BASE +#elif defined(CONFIG_SPL_BUILD) #define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE #else #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index eeb19a9fa68a..3ccfeca890bc 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -58,7 +58,7 @@ #define CONFIG_SPL_NAND_INIT #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SPL_MAX_SIZE (128 << 10) -#define CONFIG_SPL_TEXT_BASE 0xf8f81000 +#define CONFIG_TPL_TEXT_BASE 0xf8f81000 #define CONFIG_SYS_MPC85XX_NO_RESETVEC #define CONFIG_SYS_NAND_U_BOOT_SIZE (832 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST (0x11000000) @@ -213,7 +213,9 @@ #define CONFIG_SYS_MAX_FLASH_SECT 1024 #ifndef CONFIG_SYS_MONITOR_BASE -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_TPL_BUILD +#define CONFIG_SYS_MONITOR_BASE CONFIG_TPL_TEXT_BASE +#elif defined(CONFIG_SPL_BUILD) #define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE #else #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 459ecf328f20..0e1f9836a648 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -178,7 +178,7 @@ #define CONFIG_SPL_NAND_INIT #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SPL_MAX_SIZE (128 << 10) -#define CONFIG_SPL_TEXT_BASE 0xf8f81000 +#define CONFIG_TPL_TEXT_BASE 0xf8f81000 #define CONFIG_SYS_MPC85XX_NO_RESETVEC #define CONFIG_SYS_NAND_U_BOOT_SIZE (832 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST (0x11000000) @@ -207,7 +207,9 @@ #endif #ifndef CONFIG_SYS_MONITOR_BASE -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_TPL_BUILD +#define CONFIG_SYS_MONITOR_BASE CONFIG_TPL_TEXT_BASE +#elif defined(CONFIG_SPL_BUILD) #define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE #else #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 29626e002555..ca671eb7f5cc 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -318,14 +318,9 @@ LDFLAGS_$(SPL_BIN) += -T u-boot-spl.lds $(LDFLAGS_FINAL) # Avoid 'Not enough room for program headers' error on binutils 2.28 onwards. LDFLAGS_$(SPL_BIN) += $(call ld-option, --no-dynamic-linker) -# First try the best-match (i.e. SPL_TEXT_BASE for SPL, TPL_TEXT_BASE for TPL) +# Pick the best-match (i.e. SPL_TEXT_BASE for SPL, TPL_TEXT_BASE for TPL) ifneq ($(CONFIG_$(SPL_TPL_)TEXT_BASE),) LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_$(SPL_TPL_)TEXT_BASE) -else -# And then fall back to just testing for SPL_TEXT_BASE, even if in TPL mode -ifneq ($(CONFIG_SPL_TEXT_BASE),) -LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE) -endif endif ifdef CONFIG_TARGET_SOCFPGA_ARRIA10 -- 2.7.4

5 10

[U-Boot] [PATCH] efi_loader: Patch non-runtime code out at ExitBootServices already
by Alexander Graf 28 Jan '19

28 Jan '19

While discussing something compeltely different, Ard pointed out that it might be legal to omit calling SetVirtualAddressMap altogether. While that sounds great, we currently rely on that call to remove all function pointers to code that we do not support outside of boot services. So let's patch out those bits already on the call to ExitBootServices, so that we can successfully run even when an OS chooses to omit any call to SetVirtualAddressMap. Reported-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Signed-off-by: Alexander Graf <agraf(a)suse.de> --- include/efi_loader.h | 2 ++ lib/efi_loader/efi_boottime.c | 1 + lib/efi_loader/efi_runtime.c | 27 ++++++++++++++++++--------- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index 9dd933dae7..2a40b09693 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -310,6 +310,8 @@ void efi_save_gd(void); void efi_restore_gd(void); /* Call this to relocate the runtime section to an address space */ void efi_runtime_relocate(ulong offset, struct efi_mem_desc *map); +/* Call this when we start to live in a runtime only world */ +void efi_runtime_detach(ulong offset); /* Call this to set the current device name */ void efi_set_bootdev(const char *dev, const char *devnr, const char *path); /* Add a new object to the object list. */ diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index fc26d6adc1..8cb2979bab 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1917,6 +1917,7 @@ static efi_status_t EFIAPI efi_exit_boot_services(efi_handle_t image_handle, bootm_disable_interrupts(); /* Disable boot time services */ + efi_runtime_detach((ulong)gd->relocaddr); systab.con_in_handle = NULL; systab.con_in = NULL; systab.con_out_handle = NULL; diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index 636dfdab39..ec7fedba06 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -276,16 +276,12 @@ struct efi_runtime_detach_list_struct { void *patchto; }; -static const struct efi_runtime_detach_list_struct efi_runtime_detach_list[] = { +static struct efi_runtime_detach_list_struct efi_runtime_detach_list[] = { { /* do_reset is gone */ .ptr = &efi_runtime_services.reset_system, .patchto = efi_reset_system, }, { - /* invalidate_*cache_all are gone */ - .ptr = &efi_runtime_services.set_virtual_address_map, - .patchto = &efi_unimplemented, - }, { /* RTC accessors are gone */ .ptr = &efi_runtime_services.get_time, .patchto = &efi_get_time, @@ -328,7 +324,15 @@ static bool efi_runtime_tobedetached(void *p) return false; } -static void efi_runtime_detach(ulong offset) +/** + * efi_runtime_detach() - Remove any dependency on non-runtime sections + * + * This function patches all remaining code to be self-sufficient inside + * runtime sections. Any calls to non-runtime will be removed after this. + * + * @offset: relocaddr for pre-set_v_a_space, offset to VA after + */ +__efi_runtime void efi_runtime_detach(ulong offset) { int i; ulong patchoff = offset - (ulong)gd->relocaddr; @@ -430,19 +434,25 @@ void efi_runtime_relocate(ulong offset, struct efi_mem_desc *map) * @virtmap: virtual address mapping information * Return: status code */ -static efi_status_t EFIAPI efi_set_virtual_address_map( +static __efi_runtime efi_status_t EFIAPI efi_set_virtual_address_map( unsigned long memory_map_size, unsigned long descriptor_size, uint32_t descriptor_version, struct efi_mem_desc *virtmap) { + static __efi_runtime_data bool is_patched; int n = memory_map_size / descriptor_size; int i; int rt_code_sections = 0; + if (is_patched) + return EFI_INVALID_PARAMETER; + EFI_ENTRY("%lx %lx %x %p", memory_map_size, descriptor_size, descriptor_version, virtmap); + is_patched = true; + /* * TODO: * Further down we are cheating. While really we should implement @@ -514,8 +524,7 @@ static efi_status_t EFIAPI efi_set_virtual_address_map( map->physical_start + gd->relocaddr; efi_runtime_relocate(new_offset, map); - /* Once we're virtual, we can no longer handle - complex callbacks */ + /* We need to repatch callbacks for their new VA */ efi_runtime_detach(new_offset); return EFI_EXIT(EFI_SUCCESS); } -- 2.12.3

3 4

[U-Boot] [PATCH] Kconfig: don't pollute Kconfig w/ i.MX8M options for everyone
by Philipp Tomsich 28 Jan '19

28 Jan '19

No point in showing the various DRAM options (right in the top-level menu for 'Device Drivers') for i.MX8M when configured for a different architecture. This wraps an 'if ARCH_IMX8M' around these. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- drivers/ddr/imx/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/ddr/imx/Kconfig b/drivers/ddr/imx/Kconfig index 7e06fb2..09a35e5 100644 --- a/drivers/ddr/imx/Kconfig +++ b/drivers/ddr/imx/Kconfig @@ -1 +1,3 @@ +if ARCH_IMX8M source "drivers/ddr/imx/imx8m/Kconfig" +endif -- 2.1.4

4 4

[U-Boot] [PATCHv1] arm: stm32mp1: deploy spl in root folder
by Sean Nyekjær 28 Jan '19

28 Jan '19

Deploy u-boot-spl.stm32 binary in u-boot root folder like the rest of the boards. This makes it more streamlined when building in Yocto, Buildroot etc.. Signed-off-by: Sean Nyekjaer <sean.nyekjaer(a)prevas.dk> --- arch/arm/mach-stm32mp/config.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-stm32mp/config.mk b/arch/arm/mach-stm32mp/config.mk index cde5850e934..124729cd839 100644 --- a/arch/arm/mach-stm32mp/config.mk +++ b/arch/arm/mach-stm32mp/config.mk @@ -3,11 +3,11 @@ # Copyright (C) 2018, STMicroelectronics - All Rights Reserved # -ALL-$(CONFIG_SPL_BUILD) += spl/u-boot-spl.stm32 +ALL-$(CONFIG_SPL_BUILD) += u-boot-spl.stm32 MKIMAGEFLAGS_u-boot-spl.stm32 = -T stm32image -a $(CONFIG_SPL_TEXT_BASE) -e $(CONFIG_SPL_TEXT_BASE) -spl/u-boot-spl.stm32: MKIMAGEOUTPUT = spl/u-boot-spl.stm32.log +u-boot-spl.stm32: MKIMAGEOUTPUT = u-boot-spl.stm32.log -spl/u-boot-spl.stm32: spl/u-boot-spl.bin FORCE +u-boot-spl.stm32: spl/u-boot-spl.bin FORCE $(call if_changed,mkimage) -- 2.20.1

5 10

[U-Boot] [PATCH 0/3] Add network support for Luton SoCs
by Horatiu Vultur 28 Jan '19

28 Jan '19

This series adds network support for Luton SoCs. Currently there is not support for Luton SoCs in Linux. Horatiu Vultur (3): MIPS: mscc: luton: Add ethernet nodes for Luton. net: add MSCC Luton switch support configs: mscc_luton: add network support. MAINTAINERS | 1 + arch/mips/dts/luton_pcb090.dts | 51 +++ arch/mips/dts/luton_pcb091.dts | 51 +++ arch/mips/dts/mscc,luton.dtsi | 165 +++++++ configs/mscc_luton_defconfig | 1 + drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/luton_switch.c | 972 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 1249 insertions(+) create mode 100644 drivers/net/luton_switch.c -- 2.7.4

2 4