diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index b08aee9896..defbe465e4 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -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", diff --git a/common/cli_readline.c b/common/cli_readline.c index c7614a4c90..e86ee73faf 100644 --- a/common/cli_readline.c +++ b/common/cli_readline.c @@ -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; diff --git a/doc/build/gcc.rst b/doc/build/gcc.rst index 682051abeb..ee544ad87e 100644 --- a/doc/build/gcc.rst +++ b/doc/build/gcc.rst @@ -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 ~~~~~~~~~~ diff --git a/doc/develop/codingstyle.rst b/doc/develop/codingstyle.rst index 2b13818a8c..a6bc37bbb4 100644 --- a/doc/develop/codingstyle.rst +++ b/doc/develop/codingstyle.rst @@ -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 diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index aaaa25cefe..f54c244c32 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -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 diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c index 2c81859807..5908b5c646 100644 --- a/lib/efi_loader/efi_gop.c +++ b/lib/efi_loader/efi_gop.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -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); } diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py index 4400b8f136..d6ca9b1674 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py @@ -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', diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py index 1b5a1bb42e..2bbaa9cc55 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py @@ -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',