Minor UEFI fixes, Tegra Jetson TX series rebase
This commit is contained in:
Peter Robinson
parent
dca146ee9f
commit
d6082cf854
File diff suppressed because it is too large
Load Diff
1685
ARM-tegra-Add-support-for-framebuffer-carveouts.patch
Normal file
1685
ARM-tegra-Add-support-for-framebuffer-carveouts.patch
Normal file
File diff suppressed because it is too large
Load Diff
2949
ARM-tegra-Miscellaneous-improvements.patch
Normal file
2949
ARM-tegra-Miscellaneous-improvements.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,37 +0,0 @@
|
||||
From patchwork Fri Mar 8 20:10:23 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot] p2371-2180: Build position independent binary
|
||||
X-Patchwork-Submitter: Thierry Reding <thierry.reding@gmail.com>
|
||||
X-Patchwork-Id: 1053674
|
||||
Message-Id: <20190308201023.2145-1-thierry.reding@gmail.com>
|
||||
To: Tom Warren <twarren@nvidia.com>
|
||||
Cc: u-boot@lists.denx.de, Stephen Warren <swarren@nvidia.com>
|
||||
Date: Fri, 8 Mar 2019 21:10:23 +0100
|
||||
From: Thierry Reding <thierry.reding@gmail.com>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
From: Thierry Reding <treding@nvidia.com>
|
||||
|
||||
In order to support chainloading of U-Boot by an earlier bootloader,
|
||||
make sure the binary is position independent, so that the earlier boot-
|
||||
loader can relocate it if necessary.
|
||||
|
||||
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||||
---
|
||||
configs/p2371-2180_defconfig | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig
|
||||
index b66459e379ac..8d7cf3fb5346 100644
|
||||
--- a/configs/p2371-2180_defconfig
|
||||
+++ b/configs/p2371-2180_defconfig
|
||||
@@ -1,6 +1,7 @@
|
||||
CONFIG_ARM=y
|
||||
CONFIG_TEGRA=y
|
||||
CONFIG_SYS_TEXT_BASE=0x80110000
|
||||
+CONFIG_POSITION_INDEPENDENT=y
|
||||
CONFIG_TEGRA210=y
|
||||
CONFIG_TARGET_P2371_2180=y
|
||||
CONFIG_NR_DRAM_BANKS=2
|
||||
183
ti-am335x_evm-Enable-CONFIG_SPL_OF_CONTROL.patch
Normal file
183
ti-am335x_evm-Enable-CONFIG_SPL_OF_CONTROL.patch
Normal file
@ -0,0 +1,183 @@
|
||||
From patchwork Tue Mar 19 11:19:21 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot] ti: am335x_evm: Enable CONFIG_SPL_OF_CONTROL
|
||||
X-Patchwork-Submitter: Tom Rini <trini@konsulko.com>
|
||||
X-Patchwork-Id: 1058350
|
||||
X-Patchwork-Delegate: trini@ti.com
|
||||
Message-Id: <1552994361-32058-1-git-send-email-trini@konsulko.com>
|
||||
To: u-boot@lists.denx.de
|
||||
Date: Tue, 19 Mar 2019 07:19:21 -0400
|
||||
From: Tom Rini <trini@konsulko.com>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
Enable support for SPL_OF_CONTROL on this platform. That means doing a
|
||||
few things:
|
||||
- Add u-boot,dm-pre-reloc to a number of nodes
|
||||
- Drop static platdata in the board file.
|
||||
- A lot of tweaks to the defconfig. We remove some things such as
|
||||
SPL_USE_ARCH_MEMCPY/SET for space. Increase our malloc len.
|
||||
- Drop, for now at least, USB SPL support as it's causing a hang.
|
||||
|
||||
Cc: Faiz Abbas <faiz_abbas@ti.com>
|
||||
Cc: Lokesh Vutla <lokeshvutla@ti.com>
|
||||
Signed-off-by: Tom Rini <trini@konsulko.com>
|
||||
---
|
||||
arch/arm/dts/am335x-evm-u-boot.dtsi | 45 +++++++++++++++++++++++++++++++++++--
|
||||
board/ti/am335x/board.c | 30 -------------------------
|
||||
configs/am335x_evm_defconfig | 14 ++++++++----
|
||||
3 files changed, 53 insertions(+), 36 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/dts/am335x-evm-u-boot.dtsi b/arch/arm/dts/am335x-evm-u-boot.dtsi
|
||||
index b6b97ed16d91..16a9f855ad1f 100644
|
||||
--- a/arch/arm/dts/am335x-evm-u-boot.dtsi
|
||||
+++ b/arch/arm/dts/am335x-evm-u-boot.dtsi
|
||||
@@ -3,11 +3,52 @@
|
||||
* Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/
|
||||
*/
|
||||
|
||||
+#include "am33xx-u-boot.dtsi"
|
||||
|
||||
-&mmc3 {
|
||||
- status = "disabled";
|
||||
+&l4_wkup {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&scm {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&am33xx_pinmux {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&uart0_pins {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&uart0 {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&gpio0 {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&i2c0 {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&i2c0_pins {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
};
|
||||
|
||||
&usb0 {
|
||||
dr_mode = "peripheral";
|
||||
};
|
||||
+
|
||||
+&mmc1 {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&mmc1_pins {
|
||||
+ u-boot,dm-pre-reloc;
|
||||
+};
|
||||
+
|
||||
+&mmc3 {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
|
||||
index d67f94ad47ba..bfad1a75a456 100644
|
||||
--- a/board/ti/am335x/board.c
|
||||
+++ b/board/ti/am335x/board.c
|
||||
@@ -1054,33 +1054,3 @@ void board_fit_image_post_process(void **p_image, size_t *p_size)
|
||||
secure_boot_verify_image(p_image, p_size);
|
||||
}
|
||||
#endif
|
||||
-
|
||||
-#if !CONFIG_IS_ENABLED(OF_CONTROL)
|
||||
-static const struct omap_hsmmc_plat am335x_mmc0_platdata = {
|
||||
- .base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE,
|
||||
- .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_4BIT,
|
||||
- .cfg.f_min = 400000,
|
||||
- .cfg.f_max = 52000000,
|
||||
- .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195,
|
||||
- .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT,
|
||||
-};
|
||||
-
|
||||
-U_BOOT_DEVICE(am335x_mmc0) = {
|
||||
- .name = "omap_hsmmc",
|
||||
- .platdata = &am335x_mmc0_platdata,
|
||||
-};
|
||||
-
|
||||
-static const struct omap_hsmmc_plat am335x_mmc1_platdata = {
|
||||
- .base_addr = (struct hsmmc *)OMAP_HSMMC2_BASE,
|
||||
- .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_8BIT,
|
||||
- .cfg.f_min = 400000,
|
||||
- .cfg.f_max = 52000000,
|
||||
- .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195,
|
||||
- .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT,
|
||||
-};
|
||||
-
|
||||
-U_BOOT_DEVICE(am335x_mmc1) = {
|
||||
- .name = "omap_hsmmc",
|
||||
- .platdata = &am335x_mmc1_platdata,
|
||||
-};
|
||||
-#endif
|
||||
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
|
||||
index 924116835251..dd690dcb495c 100644
|
||||
--- a/configs/am335x_evm_defconfig
|
||||
+++ b/configs/am335x_evm_defconfig
|
||||
@@ -1,23 +1,26 @@
|
||||
CONFIG_ARM=y
|
||||
+# CONFIG_SPL_USE_ARCH_MEMCPY is not set
|
||||
+# CONFIG_SPL_USE_ARCH_MEMSET is not set
|
||||
CONFIG_ARCH_OMAP2PLUS=y
|
||||
CONFIG_TI_COMMON_CMD_OPTIONS=y
|
||||
+CONFIG_SYS_MALLOC_F_LEN=0x4000
|
||||
CONFIG_AM33XX=y
|
||||
+CONFIG_SPL_SYS_MALLOC_F_LEN=0x1000
|
||||
CONFIG_SPL=y
|
||||
CONFIG_DISTRO_DEFAULTS=y
|
||||
+CONFIG_TPL_SYS_MALLOC_F_LEN=0x1000
|
||||
CONFIG_SPL_LOAD_FIT=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd"
|
||||
+CONFIG_LOGLEVEL=3
|
||||
CONFIG_SYS_CONSOLE_INFO_QUIET=y
|
||||
CONFIG_VERSION_VARIABLE=y
|
||||
CONFIG_ARCH_MISC_INIT=y
|
||||
# CONFIG_SPL_FS_EXT4 is not set
|
||||
CONFIG_SPL_MTD_SUPPORT=y
|
||||
-CONFIG_SPL_MUSB_NEW_SUPPORT=y
|
||||
CONFIG_SPL_NET_SUPPORT=y
|
||||
CONFIG_SPL_NET_VCI_STRING="AM33xx U-Boot SPL"
|
||||
CONFIG_SPL_OS_BOOT=y
|
||||
-CONFIG_SPL_USB_GADGET=y
|
||||
-CONFIG_SPL_USB_ETHER=y
|
||||
CONFIG_CMD_SPL=y
|
||||
CONFIG_CMD_SPL_NAND_OFS=0x00080000
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
@@ -28,10 +31,12 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
|
||||
CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
|
||||
# CONFIG_SPL_EFI_PARTITION is not set
|
||||
CONFIG_OF_CONTROL=y
|
||||
+CONFIG_SPL_OF_CONTROL=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
|
||||
CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2"
|
||||
+CONFIG_OF_SPL_REMOVE_PROPS="clocks clock-names interrupt-parent"
|
||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
||||
-# CONFIG_BLK is not set
|
||||
+CONFIG_SPL_OF_TRANSLATE=y
|
||||
CONFIG_BOOTCOUNT_LIMIT=y
|
||||
CONFIG_DFU_MMC=y
|
||||
CONFIG_DFU_NAND=y
|
||||
@@ -68,5 +73,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451
|
||||
CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
|
||||
CONFIG_USB_ETHER=y
|
||||
CONFIG_DYNAMIC_CRC_TABLE=y
|
||||
+CONFIG_SPL_TINY_MEMSET=y
|
||||
CONFIG_RSA=y
|
||||
CONFIG_LZO=y
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2019.04
|
||||
Release: 0.6%{?candidate:.%{candidate}}%{?dist}
|
||||
Release: 0.7%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||
URL: http://www.denx.de/wiki/U-Boot
|
||||
@ -20,14 +20,15 @@ Patch1: uefi-use-Fedora-specific-path-name.patch
|
||||
# general fixes
|
||||
Patch2: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
||||
Patch3: usb-kbd-fixes.patch
|
||||
Patch4: uefi-rc5-fixes.patch
|
||||
|
||||
# Board fixes and enablement
|
||||
Patch10: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
||||
Patch11: dragonboard-fixes.patch
|
||||
|
||||
Patch12: ARM-tegra-Add-NVIDIA-Jetson-Nano-Developer-Kit-support.patch
|
||||
Patch13: tegra-p2371-2180-Build-position-independent-binary.patch
|
||||
Patch14: net-eth-uclass-Write-MAC-address-to-hardware-after-probe.patch
|
||||
Patch12: ARM-tegra-Miscellaneous-improvements.patch
|
||||
Patch13: ARM-tegra-Add-support-for-framebuffer-carveouts.patch
|
||||
Patch14: ARM-tegra-Add-NVIDIA-Jetson-Nano-Developer-Kit-support.patch
|
||||
Patch15: net-eth-uclass-Write-MAC-address-to-hardware-after-probe.patch
|
||||
|
||||
BuildRequires: bc
|
||||
BuildRequires: dtc
|
||||
@ -302,6 +303,9 @@ cp -p board/warp7/README builds/docs/README.warp7
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sun Mar 24 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.04-0.7-rc4
|
||||
- Minor UEFI fixes, Tegra Jetson TX series rebase
|
||||
|
||||
* Wed Mar 20 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.04-0.6-rc4
|
||||
- Tegra Jetson TX-series improvements
|
||||
|
||||
|
||||
245
uefi-rc5-fixes.patch
Normal file
245
uefi-rc5-fixes.patch
Normal file
@ -0,0 +1,245 @@
|
||||
From 306b16718edddd660b84bf3c6627ce5d41b53ce7 Mon Sep 17 00:00:00 2001
|
||||
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
Date: Mon, 18 Mar 2019 20:01:59 +0100
|
||||
Subject: [PATCH 01/25] efi_loader: correct parameter size in efi_allocate_pool
|
||||
|
||||
efi_allocate_pages() expects a (uint64_t *) pointer to pass the address of
|
||||
the assigned memory. If we pass the address of a pointer here, an illegal
|
||||
memory access occurs on 32bit systems.
|
||||
|
||||
Fixes: 282a06cbcae8 ("efi_loader: Expose U-Boot addresses in memory map
|
||||
for sandbox")
|
||||
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
---
|
||||
lib/efi_loader/efi_memory.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
|
||||
index ebd2b36c03..55622d2fb4 100644
|
||||
--- a/lib/efi_loader/efi_memory.c
|
||||
+++ b/lib/efi_loader/efi_memory.c
|
||||
@@ -440,6 +440,7 @@ efi_status_t efi_free_pages(uint64_t memory, efi_uintn_t pages)
|
||||
efi_status_t efi_allocate_pool(int pool_type, efi_uintn_t size, void **buffer)
|
||||
{
|
||||
efi_status_t r;
|
||||
+ u64 addr;
|
||||
struct efi_pool_allocation *alloc;
|
||||
u64 num_pages = efi_size_in_pages(size +
|
||||
sizeof(struct efi_pool_allocation));
|
||||
@@ -453,9 +454,9 @@ efi_status_t efi_allocate_pool(int pool_type, efi_uintn_t size, void **buffer)
|
||||
}
|
||||
|
||||
r = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES, pool_type, num_pages,
|
||||
- (uint64_t *)&alloc);
|
||||
-
|
||||
+ &addr);
|
||||
if (r == EFI_SUCCESS) {
|
||||
+ alloc = (struct efi_pool_allocation *)(uintptr_t)addr;
|
||||
alloc->num_pages = num_pages;
|
||||
*buffer = alloc->data;
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
|
||||
From bd3b7478d1e17b4d487d276f5cc0e4f4ef9fc4b7 Mon Sep 17 00:00:00 2001
|
||||
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
Date: Tue, 19 Mar 2019 12:30:27 +0100
|
||||
Subject: [PATCH 02/25] efi_loader: endless loop in add_strings_package()
|
||||
|
||||
Avoid an endless loop in add_strings_package().
|
||||
|
||||
Suggested-by: Takahiro Akashi <takahiro.akashi@linaro.org>
|
||||
Reported-by: Coverity (CID 185833)
|
||||
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
---
|
||||
lib/efi_loader/efi_hii.c | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/efi_loader/efi_hii.c b/lib/efi_loader/efi_hii.c
|
||||
index 3a966fa4df..61b71dec62 100644
|
||||
--- a/lib/efi_loader/efi_hii.c
|
||||
+++ b/lib/efi_loader/efi_hii.c
|
||||
@@ -227,9 +227,8 @@ out:
|
||||
error:
|
||||
if (stbl) {
|
||||
free(stbl->language);
|
||||
- if (idx > 0)
|
||||
- while (--idx >= 0)
|
||||
- free(stbl->strings[idx].string);
|
||||
+ while (idx > 0)
|
||||
+ free(stbl->strings[--idx].string);
|
||||
free(stbl->strings);
|
||||
}
|
||||
free(stbl);
|
||||
--
|
||||
2.20.1
|
||||
|
||||
From e7dae584b05feaf507c5b85a704a2c1d25abffc9 Mon Sep 17 00:00:00 2001
|
||||
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
Date: Tue, 19 Mar 2019 18:36:21 +0100
|
||||
Subject: [PATCH 03/25] efi_loader: missing return in
|
||||
efi_get_next_variable_name()
|
||||
|
||||
Add a missing return statement in efi_get_next_variable_name().
|
||||
|
||||
Reported-by: Coverity (CID 185834)
|
||||
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
---
|
||||
lib/efi_loader/efi_variable.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
|
||||
index e0d7f5736d..699f4184d9 100644
|
||||
--- a/lib/efi_loader/efi_variable.c
|
||||
+++ b/lib/efi_loader/efi_variable.c
|
||||
@@ -335,7 +335,7 @@ efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,
|
||||
EFI_ENTRY("%p \"%ls\" %pUl", variable_name_size, variable_name, vendor);
|
||||
|
||||
if (!variable_name_size || !variable_name || !vendor)
|
||||
- EFI_EXIT(EFI_INVALID_PARAMETER);
|
||||
+ return EFI_EXIT(EFI_INVALID_PARAMETER);
|
||||
|
||||
if (variable_name[0]) {
|
||||
/* check null-terminated string */
|
||||
--
|
||||
2.20.1
|
||||
|
||||
From 1fd7a4764103781e424ef687034da06de3cb60b7 Mon Sep 17 00:00:00 2001
|
||||
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
Date: Tue, 19 Mar 2019 18:44:05 +0100
|
||||
Subject: [PATCH 04/25] efi_loader: memory leak in efi_dump_single_var()
|
||||
|
||||
A misplaced return statement lead to a memory leak in
|
||||
efi_dump_single_var().
|
||||
|
||||
Reported-by: Coverity (CID 185829)
|
||||
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
---
|
||||
cmd/nvedit_efi.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c
|
||||
index ca32566a61..e65b38dbf3 100644
|
||||
--- a/cmd/nvedit_efi.c
|
||||
+++ b/cmd/nvedit_efi.c
|
||||
@@ -80,7 +80,6 @@ static void efi_dump_single_var(u16 *name, efi_guid_t *guid)
|
||||
printf(", DataSize = 0x%zx\n", size);
|
||||
print_hex_dump(" ", DUMP_PREFIX_OFFSET, 16, 1, data, size, true);
|
||||
|
||||
- return;
|
||||
out:
|
||||
free(data);
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
|
||||
From d5974af7f7626777b5c41894f75c813ff35c1793 Mon Sep 17 00:00:00 2001
|
||||
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
Date: Tue, 19 Mar 2019 18:58:58 +0100
|
||||
Subject: [PATCH 05/25] efi_loader: remove superfluous check in
|
||||
efi_setup_loaded_image()
|
||||
|
||||
It does not make any sense to check if a pointer is NULL if we have
|
||||
dereferenced it before.
|
||||
|
||||
Reported-by: Coverity (CID 185827)
|
||||
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
---
|
||||
lib/efi_loader/efi_boottime.c | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
|
||||
index bd8b8a17ae..4fc550d9f3 100644
|
||||
--- a/lib/efi_loader/efi_boottime.c
|
||||
+++ b/lib/efi_loader/efi_boottime.c
|
||||
@@ -1581,10 +1581,8 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path,
|
||||
goto failure;
|
||||
#endif
|
||||
|
||||
- if (info_ptr)
|
||||
- *info_ptr = info;
|
||||
- if (handle_ptr)
|
||||
- *handle_ptr = obj;
|
||||
+ *info_ptr = info;
|
||||
+ *handle_ptr = obj;
|
||||
|
||||
return ret;
|
||||
failure:
|
||||
--
|
||||
2.20.1
|
||||
|
||||
From 1646e0928c8eb052bfa2283a6ab8d9f2a92a10e9 Mon Sep 17 00:00:00 2001
|
||||
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
Date: Tue, 19 Mar 2019 19:16:23 +0100
|
||||
Subject: [PATCH 06/25] efi_loader: superfluous conversion in efi_file_open()
|
||||
|
||||
printf("%ls", ..) expects u16 * as argument to print. There is not need for
|
||||
a conversion to wchar_t *.
|
||||
|
||||
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
---
|
||||
lib/efi_loader/efi_file.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
|
||||
index 3a7323765b..bc715218a1 100644
|
||||
--- a/lib/efi_loader/efi_file.c
|
||||
+++ b/lib/efi_loader/efi_file.c
|
||||
@@ -226,7 +226,7 @@ static efi_status_t EFIAPI efi_file_open(struct efi_file_handle *file,
|
||||
efi_status_t ret;
|
||||
|
||||
EFI_ENTRY("%p, %p, \"%ls\", %llx, %llu", file, new_handle,
|
||||
- (wchar_t *)file_name, open_mode, attributes);
|
||||
+ file_name, open_mode, attributes);
|
||||
|
||||
/* Check parameters */
|
||||
if (!file || !new_handle || !file_name) {
|
||||
--
|
||||
2.20.1
|
||||
|
||||
From d0bd87612f410a723d5ddb3001e805485e3efb4f Mon Sep 17 00:00:00 2001
|
||||
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
Date: Tue, 19 Mar 2019 20:08:46 +0100
|
||||
Subject: [PATCH 07/25] efi_selftest: fix test_hii_string_get_string()
|
||||
|
||||
The check testing the string result of get_string() returned the wrong
|
||||
result. The result was ignored.
|
||||
|
||||
Use efi_st_strcmp_16_8() for the string comparison.
|
||||
|
||||
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
---
|
||||
lib/efi_selftest/efi_selftest_hii.c | 17 ++++-------------
|
||||
1 file changed, 4 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/lib/efi_selftest/efi_selftest_hii.c b/lib/efi_selftest/efi_selftest_hii.c
|
||||
index 8a0b3bc353..f4b70f7950 100644
|
||||
--- a/lib/efi_selftest/efi_selftest_hii.c
|
||||
+++ b/lib/efi_selftest/efi_selftest_hii.c
|
||||
@@ -783,19 +783,10 @@ static int test_hii_string_get_string(void)
|
||||
goto out;
|
||||
}
|
||||
|
||||
-#if 1
|
||||
- u16 *c1, *c2;
|
||||
-
|
||||
- for (c1 = string, c2 = L"Japanese"; *c1 == *c2; c1++, c2++)
|
||||
- ;
|
||||
- if (!*c1 && !*c2)
|
||||
- result = EFI_ST_SUCCESS;
|
||||
- else
|
||||
- result = EFI_ST_FAILURE;
|
||||
-#else
|
||||
- /* TODO: %ls */
|
||||
- efi_st_printf("got string is %s (can be wrong)\n", string);
|
||||
-#endif
|
||||
+ if (efi_st_strcmp_16_8(string, "Japanese")) {
|
||||
+ efi_st_error("get_string returned incorrect string\n");
|
||||
+ goto out;
|
||||
+ }
|
||||
|
||||
result = EFI_ST_SUCCESS;
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user