mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-04-20 11:29:54 +00:00
Code Issues Projects Releases Wiki Activity

arm-bsp/u-boot: corstone1000: Fix SCT failures

Browse Source 
This patch removes the CONFIG_CMD_DHCP and CONFIG_CMD_PING
config parameters from the defconfig. It also reverts the workaround
patch which disabled NV get and set on u-boot.

Change-Id: I80f41235dbca2e76003c28164b42f4403dadc499
Signed-off-by: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
This commit is contained in:
Gowtham Suresh Kumar
2021-12-20 14:14:16 +00:00
committed by Jon Mason
parent 53a8363f29
commit 9b07bb8901
3 changed files with 81 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0043-Disable-DHCP-PING-config-parameters.patch Normal file
View File

@@ -0,0 +1,31 @@
Upstream-Status: Pending [Not submitted to upstream yet]
Signed-off-by: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
From e6b420ce5d56fcc08aac2812ee5402686fa56fae Mon Sep 17 00:00:00 2001
From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
Date: Thu, 16 Dec 2021 17:25:29 +0000
Subject: [PATCH] Disable DHCP, PING config parameters
Signed-off-by: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
---
configs/corstone1000_defconfig | 2 --
1 file changed, 2 deletions(-)
diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig
index 3c00e13ceb..e11ffbfc89 100644
--- a/configs/corstone1000_defconfig
+++ b/configs/corstone1000_defconfig
@@ -31,10 +31,8 @@ CONFIG_CMD_NVEDIT_EFI=y
CONFIG_CMD_USB=y
CONFIG_CMD_ITEST=y
# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
# CONFIG_CMD_NFS is not set
CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_EFIDEBUG=y
CONFIG_CMD_FAT=y
--
2.17.1

48
meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0044-Revert-corstone1000-Disable-set-get-of-NV-variables.patch Normal file
View File

@@ -0,0 +1,48 @@
Upstream-Status: Pending [Not submitted to upstream yet]
Signed-off-by: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
From 2a8d1b3fb89ae68d126e16f8346405df8fcc3ed6 Mon Sep 17 00:00:00 2001
From: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
Date: Thu, 16 Dec 2021 19:36:18 +0000
Subject: [PATCH] Revert "corstone1000: Disable set/get of NV variables"
This reverts commit 5c77e9883ea29472c353d63c66a7f8ffd6ea367f.
Signed-off-by: Gowtham Suresh Kumar <gowtham.sureshkumar@arm.com>
---
lib/efi_loader/efi_setup.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c
index fcf2eae9cd..9e3399a28c 100644
--- a/lib/efi_loader/efi_setup.c
+++ b/lib/efi_loader/efi_setup.c
@@ -83,11 +83,7 @@ static efi_status_t efi_init_platform_lang(void)
ret = efi_set_variable_int(L"PlatformLang",
&efi_global_variable_guid,
- /*
- * This is a temporary change until NV memory is accessible
- * through OpenAmp.
- */
- //EFI_VARIABLE_NON_VOLATILE |
+ EFI_VARIABLE_NON_VOLATILE |
EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS,
1 + strlen(lang), lang, false);
@@ -214,11 +210,7 @@ static efi_status_t efi_clear_os_indications(void)
os_indications &=
~EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED;
ret = efi_set_variable_int(L"OsIndications", &efi_global_variable_guid,
- /*
- * This is a temporary change until NV memory is accessible
- * through OpenAmp.
- */
- //EFI_VARIABLE_NON_VOLATILE |
+ EFI_VARIABLE_NON_VOLATILE |
EFI_VARIABLE_BOOTSERVICE_ACCESS |
EFI_VARIABLE_RUNTIME_ACCESS,
sizeof(os_indications), &os_indications,
--
2.17.1

2
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
View File

@@ -52,6 +52,8 @@ SRC_URI:append:corstone1000 = " \
file://0040-Return-proper-error-code-when-rx-buffer-is-larger.patch \
file://0041-Use-correct-buffer-size.patch \
file://0042-Update-comm_buf-when-EFI_BUFFER_TOO_SMALL.patch \
file://0043-Disable-DHCP-PING-config-parameters.patch \
file://0044-Revert-corstone1000-Disable-set-get-of-NV-variables.patch \
"
#