mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-26 05:34:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Pull request for efi-2022-10-rc1-2

Browse Source 
Documentation:
 
 * doc: add package uuid-dev to build dependencies
 
 UEFI:
 
 * remove support for CONFIG_LCD
 * fix authenticated capsules tests
 
 Others:
 
 * pxe: simplify label_boot()
 * cli: support bracketed paste
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEbcT5xx8ppvoGt20zxIHbvCwFGsQFAmLa68MACgkQxIHbvCwF
 GsRf2g/+IS8p7P/wHzTS4CyE0puefQX8C8gMjiXYkl0FU3a7Ebg+ujZd7dTYEn7y
 PJqSnITniK6dK1UlGi7Z0BA8Uwyg4PSG9Ow7no9hUtqyQzTqvTtIc5eOb5fGlTS7
 Z86TWX/fKx2STy95py178CGb+ifBD2DhGybJg8jnuxVKKzF7BMSBKTZ3ArWrDrFg
 6mSIdwvbkByjDd5GBniLyk+w1ilYh8BkQfe4AXup+2aFVdv9qFsFlR0gFcpUv8K3
 aF30z2icdzOVSsb2SVfv0aiuQQIWs9HLuNK3CHPIJPkNScRmNuIeucTGoLgvxBgJ
 Quz6rDVjLCcZX++3ybwT+OonCzPB5rw0ovd9K94FvNjgVc9Aw0RECb02KyU1Mr4p
 y3+hXnAk3F2r3sY5y0rU+xPOj4ouyC51kkk2G1prvZMQdEq6tAxf8PLS5E4ovX00
 B0NXv2C418By4DfIFrtwOqfPwopCFJxWuZ6XlLnJ1sJbRt8QpJmZoIWljVyQ82ef
 qHV6FVBwrMZo1XWVvVUDIwY2JfxKkGWp7LSScNEERqcHqGxD8oK4YplrI7h061qV
 kOyivleG/yENe6BssRcTEhCP3u8sTzJXFLDZhq0qOw4h9uXCyMtMKIcU74GqZ3LE
 YWPmACrkxWJt8fnYRTwoKwa756Tv9xZC0bV+zslmJH+JvASO5zg=
 =xN84
 -----END PGP SIGNATURE-----

Merge tag 'efi-2022-10-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request for efi-2022-10-rc1-2

Documentation:

* doc: add package uuid-dev to build dependencies

UEFI:

* remove support for CONFIG_LCD
* fix authenticated capsules tests

Others:

* pxe: simplify label_boot()
* cli: support bracketed paste
This commit is contained in:
Tom Rini 2022-07-22 20:48:51 -04:00
commit 03662dc506
8 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
boot/pxe_utils.c
View File

@ -532,11 +532,10 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label)
}
initrd_addr_str = env_get("ramdisk_addr_r");
strcpy(initrd_filesize, simple_xtoa(size));
strncpy(initrd_str, initrd_addr_str, 18);
strcat(initrd_str, ":");
strncat(initrd_str, initrd_filesize, 9);
size = snprintf(initrd_str, sizeof(initrd_str), "%s:%lx",
initrd_addr_str, size);
if (size >= sizeof(initrd_str))
return 1;
}
if (get_relfile_envaddr(ctx, label->kernel, "kernel_addr_r",

22
common/cli_readline.c
View File

@ -321,6 +321,7 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len,
act = ESC_CONVERTED;
break; /* pass off to ^N handler */
case '1':
case '2':
case '3':
case '4':
case '7':
@ -332,7 +333,8 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len,
break;
}
} else if (esc_len == 3) {
if (ichar == '~') {
switch (ichar) {
case '~':
switch (esc_save[2]) {
case '3': /* Delete key */
ichar = CTL_CH('d');
@ -349,9 +351,25 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len,
act = ESC_CONVERTED;
break; /* pass to ^E handler */
}
break;
case '0':
if (esc_save[2] == '2')
act = ESC_SAVE;
break;
}
} else if (esc_len == 4) {
switch (ichar) {
case '0':
case '1':
act = ESC_SAVE;
break; /* bracketed paste */
}
} else if (esc_len == 5) {
if (ichar == '~') { /* bracketed paste */
ichar = 0;
act = ESC_CONVERTED;
}
}
switch (act) {
case ESC_SAVE:
esc_save[esc_len++] = ichar;

2
doc/build/gcc.rst vendored
View File

@ -30,7 +30,7 @@ Depending on the build targets further packages maybe needed
pkg-config python3 python3-asteval python3-coverage \
python3-pkg-resources python3-pycryptodome python3-pyelftools \
python3-pytest python3-sphinxcontrib.apidoc python3-sphinx-rtd-theme \
python3-subunit python3-testtools python3-virtualenv swig
python3-subunit python3-testtools python3-virtualenv swig uuid-dev
SUSE based
~~~~~~~~~~

2
doc/develop/codingstyle.rst
View File

@ -41,7 +41,7 @@ The following rules apply:
* The exception here is Python which requires 4 spaces instead.
* All source files need to be in "Unix" and not "DOS" or "Windows" formatted,
* All source files need to be in "Unix" and not "DOS" or "Windows" format,
with respect to line ends.
* Do not add more than 2 consecutive empty lines to source files

1
lib/efi_loader/Makefile
View File

@ -66,7 +66,6 @@ obj-$(CONFIG_EFI_VARIABLES_PRESEED) += efi_var_seed.o
endif
obj-y += efi_watchdog.o
obj-$(CONFIG_EFI_ESRT) += efi_esrt.o
obj-$(CONFIG_LCD) += efi_gop.o
obj-$(CONFIG_DM_VIDEO) += efi_gop.o
obj-$(CONFIG_BLK) += efi_disk.o
obj-$(CONFIG_NET) += efi_net.o

5
lib/efi_loader/efi_gop.c
View File

@ -8,7 +8,6 @@
#include <common.h>
#include <dm.h>
#include <efi_loader.h>
#include <lcd.h>
#include <log.h>
#include <malloc.h>
#include <video.h>
@ -459,11 +458,7 @@ efi_status_t EFIAPI gop_blt(struct efi_gop *this, struct efi_gop_pixel *buffer,
if (ret != EFI_SUCCESS)
return EFI_EXIT(ret);
#ifdef CONFIG_DM_VIDEO
video_sync_all();
#else
lcd_sync();
#endif
return EFI_EXIT(EFI_SUCCESS);
}

3
test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py
View File

@ -40,6 +40,7 @@ class TestEfiCapsuleFirmwareSignedFit(object):
with u_boot_console.log.section('Test Case 1-a, before reboot'):
output = u_boot_console.run_command_list([
'host bind 0 %s' % disk_img,
'printenv -e PlatformLangCodes', # workaround for terminal size determination
'efidebug boot add -b 1 TEST host 0:1 /helloworld.efi',
'efidebug boot order 1',
'env set -e -nv -bs -rt OsIndications =0x0000000000000004',
@ -115,6 +116,7 @@ class TestEfiCapsuleFirmwareSignedFit(object):
with u_boot_console.log.section('Test Case 2-a, before reboot'):
output = u_boot_console.run_command_list([
'host bind 0 %s' % disk_img,
'printenv -e PlatformLangCodes', # workaround for terminal size determination
'efidebug boot add -b 1 TEST host 0:1 /helloworld.efi',
'efidebug boot order 1',
'env set -e -nv -bs -rt OsIndications =0x0000000000000004',
@ -192,6 +194,7 @@ class TestEfiCapsuleFirmwareSignedFit(object):
with u_boot_console.log.section('Test Case 3-a, before reboot'):
output = u_boot_console.run_command_list([
'host bind 0 %s' % disk_img,
'printenv -e PlatformLangCodes', # workaround for terminal size determination
'efidebug boot add -b 1 TEST host 0:1 /helloworld.efi',
'efidebug boot order 1',
'env set -e -nv -bs -rt OsIndications =0x0000000000000004',

2
test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py
View File

@ -112,6 +112,7 @@ class TestEfiCapsuleFirmwareSignedRaw(object):
with u_boot_console.log.section('Test Case 2-a, before reboot'):
output = u_boot_console.run_command_list([
'host bind 0 %s' % disk_img,
'printenv -e PlatformLangCodes', # workaround for terminal size determination
'efidebug boot add -b 1 TEST host 0:1 /helloworld.efi',
'efidebug boot order 1',
'env set -e -nv -bs -rt OsIndications =0x0000000000000004',
@ -189,6 +190,7 @@ class TestEfiCapsuleFirmwareSignedRaw(object):
with u_boot_console.log.section('Test Case 3-a, before reboot'):
output = u_boot_console.run_command_list([
'host bind 0 %s' % disk_img,
'printenv -e PlatformLangCodes', # workaround for terminal size determination
'efidebug boot add -b 1 TEST host 0:1 /helloworld.efi',
'efidebug boot order 1',
'env set -e -nv -bs -rt OsIndications =0x0000000000000004',