October 2024 - U-Boot

[PATCH v6 08/12] efi_loader: Disable ANSI output for tests
by Simon Glass 15 Oct '24

15 Oct '24

We don't want ANSI characters written in tests since it is a pain to check the output with ut_assert_nextline() et al. Provide a way to tests to request that ANSI characters not be sent. Add a proper function comment while we are here, to encourage others. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- (no changes since v1) include/efi_loader.h | 21 ++++++++++++++++++++- lib/efi_loader/efi_console.c | 26 +++++++++++++++++--------- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index f84852e384f..82b90ee0f1d 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -531,8 +531,27 @@ efi_status_t efi_bootmgr_delete_boot_option(u16 boot_index); efi_status_t efi_bootmgr_run(void *fdt); /* search the boot option index in BootOrder */ bool efi_search_bootorder(u16 *bootorder, efi_uintn_t num, u32 target, u32 *index); -/* Set up console modes */ + +/** + * efi_setup_console_size() - update the mode table. + * + * By default the only mode available is 80x25. If the console has at least 50 + * lines, enable mode 80x50. If we can query the console size and it is neither + * 80x25 nor 80x50, set it as an additional mode. + */ void efi_setup_console_size(void); + +/** + * efi_console_set_ansi() - Set whether ANSI characters should be emitted + * + * These characters mess up tests which use ut_assert_nextline(). Call this + * function to tell efi_loader not to emit these characters when starting up the + * terminal + * + * @allow_ansi: Allow emitting ANSI characters + */ +void efi_console_set_ansi(bool allow_ansi); + /* Set up load options from environment variable */ efi_status_t efi_env_set_load_options(efi_handle_t handle, const char *env_var, u16 **load_options); diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index cea50c748aa..569fc9199bc 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -30,6 +30,17 @@ struct cout_mode { __maybe_unused static struct efi_object uart_obj; +/* + * suppress emission of ANSI codes for use by unit tests. Leave it as 0 for the + * default behaviour + */ +static bool no_ansi; + +void efi_console_set_ansi(bool allow_ansi) +{ + no_ansi = !allow_ansi; +} + static struct cout_mode efi_cout_modes[] = { /* EFI Mode 0 is 80x25 and always present */ { @@ -348,13 +359,6 @@ static int __maybe_unused query_vidconsole(int *rows, int *cols) return 0; } -/** - * efi_setup_console_size() - update the mode table. - * - * By default the only mode available is 80x25. If the console has at least 50 - * lines, enable mode 80x50. If we can query the console size and it is neither - * 80x25 nor 80x50, set it as an additional mode. - */ void efi_setup_console_size(void) { int rows = 25, cols = 80; @@ -362,8 +366,12 @@ void efi_setup_console_size(void) if (IS_ENABLED(CONFIG_VIDEO)) ret = query_vidconsole(&rows, &cols); - if (ret) - ret = query_console_serial(&rows, &cols); + if (ret) { + if (no_ansi) + ret = 0; + else + ret = query_console_serial(&rows, &cols); + } if (ret) return; -- 2.43.0

5 20

[PATCH v8 00/27] Integrate MbedTLS v3.6 LTS with U-Boot
by Raymond Mao 15 Oct '24

15 Oct '24

Integrate MbedTLS v3.6 LTS (currently v3.6.0) with U-Boot. Motivations: ------------ 1. MbedTLS is well maintained with LTS versions. 2. LWIP is integrated with MbedTLS and easily to enable HTTPS. 3. MbedTLS recently switched license back to GPLv2. Prerequisite: ------------- This patch series requires mbedtls git repo to be added as a subtree to the main U-Boot repo via: $ git subtree add --prefix lib/mbedtls/external/mbedtls \ https://github.com/Mbed-TLS/mbedtls.git \ v3.6.0 --squash Moreover, due to the Windows-style files from mbedtls git repo, we need to convert the CRLF endings to LF and do a commit manually: $ git add --renormalize . $ git commit New Kconfig options: -------------------- `MBEDTLS_LIB` is for MbedTLS general switch. `MBEDTLS_LIB_CRYPTO` is for replacing original digest and crypto libs with MbedTLS. `MBEDTLS_LIB_CRYPTO_ALT` is for using original U-Boot crypto libs as MbedTLS crypto alternatives. `MBEDTLS_LIB_X509` is for replacing original X509, PKCS7, MSCode, ASN1, and Pubkey parser with MbedTLS. By default `MBEDTLS_LIB_CRYPTO_ALT` and `MBEDTLS_LIB_X509` are selected when `MBEDTLS_LIB` is enabled. `LEGACY_CRYPTO` is introduced as a main switch for legacy crypto library. `LEGACY_CRYPTO_BASIC` is for the basic crypto functionalities and `LEGACY_CRYPTO_CERT` is for the certificate related functionalities. For each of the algorithm, a pair of `<alg>_LEGACY` and `<alg>_MBEDTLS` Kconfig options are introduced. Meanwhile, `SPL_` Kconfig options are introduced. In this patch set, MBEDTLS_LIB, MBEDTLS_LIB_CRYPTO and MBEDTLS_LIB_X509 are by default enabled in qemu_arm64_defconfig and sandbox_defconfig for testing purpose. Patches for external MbedTLS project: ------------------------------------- Since U-Boot uses Microsoft Authentication Code to verify PE/COFFs executables which is not supported by MbedTLS at the moment, addtional patches for MbedTLS are created to adapt with the EFI loader: 1. Decoding of Microsoft Authentication Code. 2. Decoding of PKCS#9 Authenticate Attributes. 3. Extending MbedTLS PKCS#7 lib to support multiple signer's certificates. 4. MbedTLS native test suites for PKCS#7 signer's info. All above 4 patches (tagged with `mbedtls/external`) are submitted to MbedTLS project and being reviewed, eventually they should be part of MbedTLS LTS release. But before that, please merge them into U-Boot, otherwise the building will be broken when MBEDTLS_LIB_X509 is enabled. See below PR link for the reference: https://github.com/Mbed-TLS/mbedtls/pull/9001 Miscellaneous: -------------- Optimized MbedTLS library size by tailoring the config file and disabling all unnecessary features for EFI loader. >From v2, original libs (rsa, asn1_decoder, rsa_helper, md5, sha1, sha256, sha512) are completely replaced when MbedTLS is enabled. >From v3, the size-growth is slightly reduced by refactoring Hash functions. >From v6, smaller implementations for SHA256 and SHA512 are enabled and target size reduce significantly. Target(QEMU arm64) size-growth when enabling MbedTLS: v1: 6.03% v2: 4.66% v3 - v5: 4.55% v6: 2.90% Please see the latest output from buildman for size-growth on QEMU arm64, Sandbox and Nanopi A64. [1] Tests done: ----------- EFI Secure Boot test (EFI variables loading and verifying, EFI signed image verifying and booting) via U-Boot console. EFI Secure Boot and Capsule sandbox test passed. Known issues: ------------- None. [1]: buildman output for size comparison (With both `MBEDTLS_LIB` and `MBEDTLS_LIB_CRYPTO` selected) (qemu_arm64, sandbox and nanopi_a64) ``` aarch64: (for 2/2 boards) all -1568.0 bss -8.0 data -64.0 rodata +200.0 text -1696.0 qemu_arm64 : all +4472 bss -16 data -64 rodata +200 text +4352 u-boot: add: 29/-14, grow: 6/-13 bytes: 12812/-8084 (4728) function old new delta mbedtls_internal_sha1_process - 4540 +4540 mbedtls_internal_md5_process - 2928 +2928 K - 896 +896 mbedtls_sha256_finish - 484 +484 mbedtls_internal_sha256_process - 432 +432 mbedtls_sha1_finish - 420 +420 mbedtls_internal_sha512_process - 412 +412 mbedtls_sha512_finish - 360 +360 mbedtls_sha512_starts - 340 +340 mbedtls_md5_finish - 336 +336 mbedtls_sha512_update - 264 +264 mbedtls_sha256_update - 252 +252 mbedtls_sha1_update - 236 +236 mbedtls_md5_update - 236 +236 mbedtls_sha512 - 148 +148 mbedtls_sha256_starts - 124 +124 mbedtls_sha1_starts - 72 +72 mbedtls_md5_starts - 60 +60 mbedtls_platform_zeroize - 56 +56 sha512_put_uint64_be - 40 +40 mbedtls_sha512_free - 16 +16 mbedtls_sha256_free - 16 +16 mbedtls_sha1_free - 16 +16 mbedtls_md5_free - 16 +16 sha512_csum_wd 68 80 +12 sha256_csum_wd 68 80 +12 sha1_csum_wd 68 80 +12 md5_wd 68 80 +12 mbedtls_sha512_init - 12 +12 mbedtls_sha256_init - 12 +12 mbedtls_sha1_init - 12 +12 mbedtls_md5_init - 12 +12 memset_func - 8 +8 sha512_update 4 8 +4 sha384_update 4 8 +4 sha256_update 12 8 -4 sha1_update 12 8 -4 sha256_process 16 - -16 sha1_process 16 - -16 MD5Init 56 36 -20 sha1_starts 60 36 -24 sha384_csum_wd 68 12 -56 sha256_starts 104 40 -64 sha256_padding 64 - -64 sha1_padding 64 - -64 sha512_finish 152 36 -116 sha512_starts 168 40 -128 sha384_starts 168 40 -128 sha384_finish 152 4 -148 MD5Final 196 44 -152 sha512_base_do_finalize 160 - -160 static.sha256_update 228 - -228 static.sha1_update 240 - -240 sha512_base_do_update 244 - -244 MD5Update 260 - -260 sha1_finish 300 36 -264 sha256_finish 404 36 -368 sha256_armv8_ce_process 428 - -428 sha1_armv8_ce_process 484 - -484 sha512_K 640 - -640 sha512_block_fn 1212 - -1212 MD5Transform 2552 - -2552 nanopi_a64 : all -7608 data -64 rodata +200 text -7744 u-boot: add: 21/-6, grow: 0/-8 bytes: 10524/-4308 (6216) function old new delta mbedtls_internal_sha1_process - 4540 +4540 mbedtls_internal_md5_process - 2928 +2928 mbedtls_sha256_finish - 484 +484 mbedtls_internal_sha256_process - 432 +432 mbedtls_sha1_finish - 420 +420 mbedtls_md5_finish - 336 +336 K - 256 +256 mbedtls_sha256_update - 252 +252 mbedtls_sha1_update - 236 +236 mbedtls_md5_update - 236 +236 mbedtls_sha256_starts - 124 +124 mbedtls_sha1_starts - 72 +72 mbedtls_md5_starts - 60 +60 mbedtls_platform_zeroize - 56 +56 mbedtls_sha256_free - 16 +16 mbedtls_sha1_free - 16 +16 mbedtls_md5_free - 16 +16 mbedtls_sha256_init - 12 +12 mbedtls_sha1_init - 12 +12 mbedtls_md5_init - 12 +12 memset_func - 8 +8 sha256_update 12 8 -4 sha1_update 12 8 -4 MD5Init 56 36 -20 sha1_starts 60 36 -24 sha256_starts 104 40 -64 sha256_padding 64 - -64 sha1_padding 64 - -64 MD5Final 196 44 -152 static.sha256_update 228 - -228 static.sha1_update 240 - -240 MD5Update 260 - -260 sha1_finish 300 36 -264 sha256_finish 404 36 -368 MD5Transform 2552 - -2552 sandbox: (for 1/1 boards) all +17776.0 bss +128.0 data +1376.0 rodata -4288.0 text +20560.0 sandbox : all +17776 bss +128 data +1376 rodata -4288 text +20560 u-boot: add: 246/-205, grow: 85/-47 bytes: 92037/-80203 (11834) function old new delta mbr_test_run - 6557 +6557 static.compress_using_gzip - 5344 +5344 mbedtls_internal_sha1_process - 4982 +4982 static.mbedtls_x509_crt_parse_der_internal - 4184 +4184 pkcs7_parse_message 361 3638 +3277 rsa_verify 541 2794 +2253 mbedtls_internal_md5_process - 2189 +2189 mbedtls_rsa_parse_pubkey - 2045 +2045 static.make_fuller_fdt - 1991 +1991 mbedtls_rsa_private - 1813 +1813 compress_frame_buffer - 1704 +1704 mbedtls_mpi_exp_mod - 1649 +1649 wget_handler - 1483 +1483 x509_populate_cert - 1462 +1462 mbedtls_mpi_div_mpi - 1455 +1455 static.mbedtls_x509_dn_gets - 1305 +1305 mbedtls_mpi_inv_mod - 1214 +1214 tftp_handler - 1199 +1199 mbedtls_rsa_rsaes_pkcs1_v15_decrypt - 1156 +1156 mbedtls_x509_get_subject_alt_name_ext - 1155 +1155 tcg2_log_parse - 1060 +1060 HUF_decompress4X1_usingDTable_internal_body - 1029 +1029 rsa_check_pair_wrap - 1018 +1018 static.K - 896 +896 oid_x520_attr_type - 840 +840 load_sandbox_scmi_test_devices - 776 +776 static.prep_mmc_bootdev - 773 +773 efi_load_image 4418 5157 +739 static.pkcs7_get_signer_info - 671 +671 mbedtls_mpi_core_montmul - 537 +537 mbedtls_internal_sha512_process - 536 +536 mbedtls_mpi_core_mla - 520 +520 static.compress_using_zstd - 498 +498 static.compress_using_lzo - 498 +498 static.compress_using_lzma - 498 +498 static.compress_using_lz4 - 498 +498 static.compress_using_bzip2 - 498 +498 mbedtls_internal_sha256_process - 487 +487 static.overlay_update_local_node_references - 483 +483 mbedtls_x509_get_time - 483 +483 mbedtls_mpi_mul_mpi - 479 +479 mbedtls_x509_get_name - 470 +470 mbedtls_pk_parse_subpubkey - 463 +463 mbedtls_sha1_finish - 455 +455 new_string - 450 +450 set_string - 448 +448 wget_send_stored - 434 +434 rsa_rsassa_pkcs1_v15_encode - 414 +414 mbedtls_mpi_gcd - 409 +409 get_languages - 402 +402 list_package_lists - 398 +398 efi_cin_read_key_stroke_ex - 393 +393 update_package_list - 374 +374 static.dns_handler - 374 +374 fastboot_handler - 363 +363 static.efi_str_to_fat - 362 +362 oid_x509_ext - 360 +360 get_string 166 526 +360 new_package_list - 359 +359 efi_convert_device_path_to_text - 359 +359 mbedtls_sha512_finish - 358 +358 rsa_sign_wrap - 355 +355 get_keyboard_layout - 355 +355 add_sub_mpi - 355 +355 find_keyboard_layouts - 339 +339 static.scan_mmc_bootdev - 338 +338 rsa_verify_wrap - 324 +324 oid_sig_alg - 320 +320 mbedtls_mpi_sub_abs - 315 +315 static.sqfs_split_path - 313 +313 append_device_path_instance - 311 +311 efi_cin_register_key_notify - 303 +303 get_secondary_languages - 301 +301 rsa_encrypt_wrap - 294 +294 efi_convert_device_node_to_text - 293 +293 get_next_device_path_instance - 290 +290 mbedtls_mpi_core_get_mont_r2_unsafe - 276 +276 public_key - 270 +270 efi_cin_unregister_key_notify - 268 +268 static.rsa_check_context - 264 +264 public_key_verify_signature 419 678 +259 __udivti3 - 248 +248 static.efi_stri_coll - 247 +247 static.oid_md_alg - 240 +240 mbedtls_rsa_public - 239 +239 mbedtls_asn1_get_alg - 238 +238 get_package_list_handle - 231 +231 static.overlay_get_target - 224 +224 mbedtls_mpi_shift_l - 224 +224 static.efi_fat_to_str - 223 +223 mbedtls_pkcs7_free - 223 +223 register_package_notify - 222 +222 create_device_node - 222 +222 mbedtls_mpi_fill_random - 221 +221 mbedtls_sha512_update - 209 +209 remove_package_list - 208 +208 export_package_lists - 206 +206 is_device_path_multi_instance - 201 +201 mbedtls_mpi_copy - 200 +200 mbedtls_sha256_update - 197 +197 set_keyboard_layout - 196 +196 static.asn1_get_tagged_int - 194 +194 efi_cin_reset_ex - 194 +194 get_device_path_size - 191 +191 append_device_path - 190 +190 static.efi_metai_match - 188 +188 append_device_node - 188 +188 static.efi_str_upr - 187 +187 static.efi_str_lwr - 187 +187 mbedtls_pk_parse_public_key - 182 +182 duplicate_device_path - 180 +180 mbedtls_x509_crt_free - 177 +177 static.mbedtls_sha1_update - 176 +176 sha256_finish 357 533 +176 fastboot_timed_send_info - 174 +174 mbedtls_mpi_shift_r - 170 +170 unregister_package_notify - 169 +169 efi_cin_set_state - 169 +169 static.cdp_compute_csum - 168 +168 efi_key_notify - 164 +164 efi_console_timer_notify - 164 +164 static.cdp_send_trigger - 161 +161 rsa_free_wrap - 161 +161 mbedtls_mpi_cmp_mpi - 161 +161 static.pkcs7_get_one_cert - 160 +160 oid_pk_alg - 160 +160 sha384_starts - 159 +159 mbedtls_mpi_read_binary - 159 +159 md5_wd 571 729 +158 mbedtls_mpi_core_write_be - 154 +154 mbedtls_mpi_mod_mpi - 146 +146 mbedtls_asn1_get_alg_null - 142 +142 mbedtls_mpi_cmp_abs - 141 +141 mbedtls_mpi_mul_int - 138 +138 HUF_decompress1X1_usingDTable_internal_body - 138 +138 mbedtls_asn1_get_len - 133 +133 wget_timeout_handler - 131 +131 tftp_filename - 128 +128 static.setup_ctx_and_base_tables - 122 +122 static.overlay_adjust_node_phandles - 121 +121 mbedtls_mpi_grow - 120 +120 mbedtls_rsa_check_pubkey - 110 +110 static.mbedtls_asn1_get_bitstring - 108 +108 x509_get_timestamp - 106 +106 ZSTD_frameHeaderSize_internal - 103 +103 tftp_timeout_handler - 102 +102 data_gz 21367 21468 +101 static.uncompress_using_bzip2 - 100 +100 mbedtls_asn1_get_bool - 99 +99 static.uncompress_using_lzma - 98 +98 static.asn1_get_sequence_of_cb - 98 +98 mbedtls_rsa_info - 96 +96 static.uncompress_using_lzo - 95 +95 static.uncompress_using_lz4 - 95 +95 static.uncompress_using_gzip - 90 +90 release_sandbox_scmi_test_devices - 88 +88 mbedtls_x509_get_serial - 88 +88 inject_response - 88 +88 mbedtls_mpi_resize_clear - 87 +87 mbedtls_mpi_bitlen - 82 +82 static.x509_get_uid - 81 +81 static.mbedtls_mpi_sub_int - 81 +81 mbedtls_oid_get_md_alg - 78 +78 mbedtls_mpi_cmp_int - 75 +75 rsa_decrypt_wrap - 73 +73 static.cdp_timeout_handler - 72 +72 sha512_put_uint64_be - 72 +72 mbedtls_md_info_from_type - 72 +72 mbedtls_mpi_lset - 69 +69 sha1_starts - 64 +64 rsa_alloc_wrap - 62 +62 mbedtls_pk_setup - 62 +62 static.clear_bloblist - 61 +61 pkcs7_free_message 115 176 +61 rsa_debug - 60 +60 mbedtls_mpi_lsb - 60 +60 lib_test_strlcat 1195 1255 +60 public_key_signature_free - 58 +58 static.x509_free_mbedtls_ctx - 57 +57 x509_populate_dn_name_string - 56 +56 mbedtls_mpi_core_montmul_init - 55 +55 mbedtls_asn1_get_bitstring_null - 53 +53 static.pkcs7_free_signer_info - 51 +51 mbedtls_mpi_free - 51 +51 static.mbedtls_mpi_core_bigendian_to_host - 50 +50 mbedtls_asn1_get_tag - 50 +50 BIT_reloadDStreamFast - 50 +50 tftp_init_load_addr - 47 +47 mbedtls_pk_free - 45 +45 mbedtls_zeroize_and_free - 42 +42 x509_parse2_int - 33 +33 mbedtls_asn1_sequence_free - 30 +30 mbedtls_asn1_free_named_data_list_shallow - 30 +30 static.check_zero - 28 +28 static.himport_r 968 995 +27 static.hexport_r 653 680 +27 sha512_starts 132 159 +27 generic_phy_get_bulk 366 392 +26 reboot_mode_probe 139 164 +25 static.mbedtls_mpi_get_bit - 23 +23 static.sqfs_opendir_nest 1655 1677 +22 rsa_can_do - 22 +22 ping_timeout_handler - 22 +22 static.mbedtls_platform_zeroize - 18 +18 static.hash_finish_sha1 40 58 +18 sha256_starts 68 86 +18 mbedtls_mpi_size - 18 +18 c2 - 18 +18 rsa_get_bitlen - 17 +17 static.time_start - 16 +16 static.__reset_get_bulk 166 182 +16 clk_get_bulk 157 173 +16 unicode_test_utf8_utf16_strcpy 946 960 +14 mbedtls_mpi_add_mpi - 14 +14 c4 - 14 +14 c1 - 14 +14 efi_file_read_int 610 623 +13 d4 - 13 +13 rtc_days_in_month - 12 +12 mbedtls_mpi_sub_mpi - 12 +12 i2 - 12 +12 efi_auth_var_get_type 102 113 +11 i1 - 10 +10 d3 - 10 +10 d2 - 10 +10 x509_free_certificate 115 124 +9 wget_load_size - 8 +8 tftp_load_addr - 8 +8 tftp_cur_block - 8 +8 static.memset_func - 8 +8 packet_icmp_handler - 8 +8 mbedtls_sha512_info - 8 +8 mbedtls_sha384_info - 8 +8 mbedtls_sha256_info - 8 +8 mbedtls_sha1_info - 8 +8 mbedtls_md5_info - 8 +8 mbedtls_ct_zero - 8 +8 image_url - 8 +8 i3 - 8 +8 c3 - 8 +8 unicode_test_utf8_utf16_strlen 443 450 +7 unicode_test_utf16_utf8_strlen 443 450 +7 unicode_test_utf16_utf8_strcpy 1021 1028 +7 mpi_bigendian_to_host - 7 +7 efi_auth_var_get_guid 81 88 +7 d1 - 7 +7 string_to_vlan 35 41 +6 ping6_timeout - 6 +6 j3 - 6 +6 j2 - 6 +6 efi_signature_verify 1640 1646 +6 static.test_data - 5 +5 on_vlan 28 33 +5 on_nvlan 28 33 +5 j1 - 5 +5 eficonfig_process_select_file 2179 2184 +5 crypt_sha512crypt_rn_wrapped 2408 2413 +5 crypt_sha256crypt_rn_wrapped 1669 1674 +5 wget_timeout_count - 4 +4 unicode_test_u16_strlen 269 273 +4 timeout_count_max - 4 +4 timeout_count - 4 +4 tftp_state - 4 +4 tftp_our_port - 4 +4 static.net_arp_wait_reply_ip - 4 +4 static.eth_errno - 4 +4 static.dns_our_port - 4 +4 static.cdp_seq - 4 +4 static.cdp_ok - 4 +4 static.bootdev_test_prio 928 932 +4 static.bootdev_test_order_default 562 566 +4 static.bootdev_test_order 2435 2439 +4 rmt_timestamp - 4 +4 retry_tcp_seq_num - 4 +4 retry_tcp_ack_num - 4 +4 retry_len - 4 +4 our_port - 4 +4 net_set_udp_header 103 107 +4 loc_timestamp - 4 +4 fastboot_our_port - 4 +4 eficonfig_edit_boot_option 1563 1567 +4 efi_launch_capsules 3138 3142 +4 efi_init_early 1051 1055 +4 current_wget_state - 4 +4 current_tcp_state - 4 +4 bootp_reset 48 52 +4 bootp_request 632 636 +4 asymmetric_key_generate_id 109 113 +4 arp_request 87 91 +4 arp_raw_request 223 227 +4 adler32 767 771 +4 unicode_test_u16_strncmp 377 380 +3 str_upper 648 651 +3 eficonfig_file_selected 484 487 +3 efi_init_obj_list 5873 5876 +3 efi_create_indexed_name 174 177 +3 bloblist_test_grow 719 722 +3 SHA256_Update_recycled 76 79 +3 unicode_test_utf8_utf16_strncpy 929 931 +2 unicode_test_utf16_utf8_strncpy 921 923 +2 tftp_windowsize - 2 +2 tftp_next_ack - 2 +2 tftp_block_size - 2 +2 static.tcg2_measure_variable 236 238 +2 static.efi_cout_output_string 541 543 +2 static.do_env_print 1278 1280 +2 prepare_file_selection_entry 400 402 +2 eficonfig_boot_edit_save 96 98 +2 eficonfig_add_change_boot_order_entry 346 348 +2 eficonfig_add_boot_selection_entry 461 463 +2 efi_str_to_u16 103 105 +2 efi_serialize_load_option 260 262 +2 efi_get_variable_mem 503 505 +2 efi_file_setinfo 523 525 +2 efi_file_getinfo 783 785 +2 efi_convert_string 109 111 +2 efi_binary_run 790 792 +2 do_bootmenu 2154 2156 +2 create_boot_option_entry 206 208 +2 bootdev_hunt 366 368 +2 add_packages 890 892 +2 unicode_test_efi_create_indexed_name 481 482 +1 u16_strsize 20 21 +1 u16_strlcat 106 107 +1 static.hash_update_sha1 29 30 +1 static.efi_set_variable_runtime 553 554 +1 retry_action - 1 +1 file_open 738 739 +1 efi_var_mem_ins 287 288 +1 efi_set_variable_int 1929 1930 +1 efi_dp_from_file 278 279 +1 static.retry_action 1 - -1 fastboot_send 1815 1814 -1 byteReverse 1 - -1 static.tftp_windowsize 2 - -2 static.tftp_next_ack 2 - -2 static.tftp_block_size 2 - -2 sha256_csum_wd 155 153 -2 net_send_udp_packet6 415 413 -2 net_set_timeout_handler 26 23 -3 fdt_open_into 435 432 -3 fdt_delprop 121 118 -3 tftp_start 1367 1363 -4 static.wget_timeout_count 4 - -4 static.timeout_count_max 4 - -4 static.timeout_count 4 - -4 static.tftp_state 4 - -4 static.tftp_our_port 4 - -4 static.rmt_timestamp 4 - -4 static.retry_tcp_seq_num 4 - -4 static.retry_tcp_ack_num 4 - -4 static.retry_len 4 - -4 static.our_port 4 - -4 static.loc_timestamp 4 - -4 static.fastboot_our_port 4 - -4 static.current_wget_state 4 - -4 static.current_tcp_state 4 - -4 static.alist_expand_to 120 116 -4 static.ZSTD_freeDDict 89 85 -4 sha512_csum_wd 169 165 -4 rarp_request 202 198 -4 pcap_post 321 317 -4 net_send_tcp_packet 52 48 -4 net_arp_wait_reply_ip 4 - -4 ndisc_request 451 447 -4 ip6_add_hdr 77 73 -4 fdt_find_string_ 83 79 -4 fdt_check_node_offset_ 46 42 -4 eth_errno 4 - -4 efi_dp_from_uart 87 83 -4 dns_our_port 4 - -4 dm_check_devices 251 247 -4 dhcp6_start 236 232 -4 cdp_seq 4 - -4 cdp_ok 4 - -4 ZSTD_getFrameHeader_advanced 449 445 -4 test_data 5 - -5 lib_test_efi_dp_check_length 593 588 -5 static.ping6_timeout 6 - -6 net_cdp_ethaddr 6 - -6 fdt_pack 80 74 -6 fdt_create_empty_tree 102 96 -6 fdt_add_subnode 312 306 -6 ZSTD_initFseState 44 37 -7 static.wget_load_size 8 - -8 static.tftp_load_addr 8 - -8 static.tftp_cur_block 8 - -8 static.packet_icmp_handler 8 - -8 static.image_url 8 - -8 static.BIT_initDStream 518 510 -8 sha384_csum_wd 296 288 -8 cdp_snap_hdr 8 - -8 static.fdt_rw_probe_ 79 70 -9 ZSTD_decompressDCtx 7745 7736 -9 rsa_verify_key 383 372 -11 fdt_setprop 147 135 -12 sha256_update 14 - -14 x509_akid_note_name 15 - -15 pkcs7_sig_note_skid 15 - -15 pkcs7_sig_note_serial 15 - -15 pkcs7_sig_note_issuer 15 - -15 time_start 16 - -16 static.rsapubkey_action_table 16 - -16 fdt_add_mem_rsv 101 85 -16 fdt_del_mem_rsv 84 67 -17 x509_note_serial 21 - -21 static.ping_timeout_handler 22 - -22 pkcs7_check_content_type 22 - -22 do_net_stats 371 349 -22 x509_decoder 24 - -24 x509_akid_decoder 24 - -24 rsapubkey_decoder 24 - -24 pkcs7_decoder 24 - -24 mscode_machine 24 - -24 mscode_decoder 24 - -24 mscode_action_table 24 - -24 check_zero 24 - -24 x509_note_tbs_certificate 26 - -26 x509_note_not_before 28 - -28 x509_note_not_after 28 - -28 pkcs7_note_data 28 - -28 x509_note_issuer 30 - -30 rsa_get_n 30 - -30 _u_boot_list_2_ut_lib_test_2_lib_asn1_x509 32 - -32 _u_boot_list_2_ut_lib_test_2_lib_asn1_pkey 32 - -32 _u_boot_list_2_ut_lib_test_2_lib_asn1_pkcs7 32 - -32 sha1_csum_wd 209 176 -33 static.hash_init_sha1 75 41 -34 static.hash_finish_sha384 40 6 -34 x509_note_subject 36 - -36 pkcs7_note_content 36 - -36 HUF_decodeStreamX1 187 151 -36 static.ZSTD_decodeSequence 462 425 -37 x509_akid_action_table 40 - -40 x509_note_params 41 - -41 pkcs7_note_signeddata_version 41 - -41 asn1_op_lengths 41 - -41 pkcs7_note_certificate_list 46 - -46 static.public_key_signature_free 48 - -48 static.tftp_init_load_addr 51 - -51 mscode_note_digest 51 - -51 static.BIT_reloadDStreamFast 54 - -54 rsa_get_e 56 - -56 clear_bloblist 57 - -57 x509_extract_name_segment 62 - -62 sha256_padding 64 - -64 sha1_padding 64 - -64 pkcs7_sig_note_signature 68 - -68 pkcs7_sig_note_set_of_authattrs 72 - -72 cdp_timeout_handler 72 - -72 pkcs7_sig_note_pkey_algo 75 - -75 sha512_finish 123 47 -76 sha384_finish 123 47 -76 pkcs7_note_signerinfo_version 79 - -79 x509_akid_note_kid 80 - -80 x509_akid_note_serial 81 - -81 pkcs7_extract_cert 81 - -81 net_loop 3226 3145 -81 uncompress_using_gzip 90 - -90 static.release_sandbox_scmi_test_devices 92 - -92 static.inject_response 92 - -92 x509_akid_machine 93 - -93 uncompress_using_lzo 95 - -95 uncompress_using_lz4 95 - -95 x509_extract_key_data 98 - -98 uncompress_using_lzma 98 - -98 uncompress_using_bzip2 100 - -100 static.tftp_timeout_handler 102 - -102 x509_action_table 104 - -104 x509_note_OID 105 - -105 static.ZSTD_frameHeaderSize_internal 107 - -107 static.hash_init_sha384 152 41 -111 x509_machine 113 - -113 overlay_adjust_node_phandles 117 - -117 setup_ctx_and_base_tables 118 - -118 x509_process_extension 125 - -125 static.tftp_filename 128 - -128 x509_note_signature 129 - -129 static.wget_timeout_handler 131 - -131 static.__func__ 34215 34080 -135 pkcs7_note_OID 136 - -136 pkcs7_action_table 136 - -136 static.HUF_decompress1X1_usingDTable_internal_body 150 - -150 oid_index 150 - -150 sha512_base_do_finalize 154 - -154 cdp_send_trigger 157 - -157 static.efi_key_notify 164 - -164 static.efi_console_timer_notify 164 - -164 cdp_compute_csum 164 - -164 static.unregister_package_notify 169 - -169 static.efi_cin_set_state 169 - -169 static.fastboot_timed_send_info 174 - -174 static.duplicate_device_path 180 - -180 pkcs7_note_signed_info 187 - -187 efi_str_upr 187 - -187 efi_str_lwr 187 - -187 static.append_device_node 188 - -188 efi_metai_match 188 - -188 mscode_note_content_type 189 - -189 static.append_device_path 190 - -190 pkcs7_sig_note_digest_algo 190 - -190 static.get_device_path_size 191 - -191 static.sha256_update 194 - -194 static.efi_cin_reset_ex 194 - -194 static.sha512_base_do_update 195 - -195 static.set_keyboard_layout 196 - -196 static.is_device_path_multi_instance 201 - -201 static.export_package_lists 206 - -206 look_up_OID 207 - -207 static.remove_package_list 208 - -208 static.sha1_update 216 - -216 tcg2_create_digest 718 500 -218 overlay_get_target 220 - -220 static.register_package_notify 222 - -222 static.create_device_node 222 - -222 efi_fat_to_str 223 - -223 static.get_package_list_handle 231 - -231 pkcs7_machine 239 - -239 static.sprint_oid 241 - -241 lib_asn1_pkcs7 244 - -244 efi_stri_coll 247 - -247 sha256_k 256 - -256 static.efi_cin_unregister_key_notify 268 - -268 pkcs7_sig_note_authenticated_attr 268 - -268 sha1_finish 288 - -288 static.get_next_device_path_instance 290 - -290 lib_asn1_pkey 290 - -290 x509_note_pkey_algo 291 - -291 static.efi_convert_device_node_to_text 293 - -293 oid_search_table 296 - -296 static.get_secondary_languages 301 - -301 static.efi_cin_register_key_notify 303 - -303 sqfs_split_path 309 - -309 static.append_device_path_instance 311 - -311 mscode_note_digest_algo 327 - -327 scan_mmc_bootdev 334 - -334 static.find_keyboard_layouts 339 - -339 plain 351 - -351 static.get_keyboard_layout 355 - -355 static.new_package_list 359 - -359 static.efi_convert_device_path_to_text 359 - -359 static.get_string 360 - -360 efi_str_to_fat 362 - -362 static.fastboot_handler 363 - -363 static.update_package_list 374 - -374 dns_handler 374 - -374 static.efi_cin_read_key_stroke_ex 393 - -393 static.list_package_lists 398 - -398 static.get_languages 402 - -402 lib_asn1_x509 423 - -423 static.x509_fabricate_name 428 - -428 static.wget_send_stored 438 - -438 static.set_string 448 - -448 static.new_string 450 - -450 overlay_update_local_node_references 479 - -479 compress_using_zstd 498 - -498 compress_using_lzo 498 - -498 compress_using_lzma 498 - -498 compress_using_lz4 498 - -498 compress_using_bzip2 498 - -498 oid_data 513 - -513 static.public_key 540 - -540 sha512_k 640 - -640 prep_mmc_bootdev 769 - -769 static.x509_decode_time 779 - -779 static.load_sandbox_scmi_test_devices 780 - -780 x509_cert_parse 973 179 -794 cert_data 971 - -971 static.HUF_decompress4X1_usingDTable_internal_body 1056 - -1056 static.tcg2_log_parse 1064 - -1064 static.tftp_handler 1199 - -1199 static.wget_handler 1483 - -1483 asn1_ber_decoder 1511 - -1511 rsa_verify_with_pkey 1676 - -1676 static.compress_frame_buffer 1708 - -1708 sha512_block_fn 1714 - -1714 image_pk7 1811 - -1811 MD5Transform 1812 - -1812 make_fuller_fdt 1987 - -1987 compress_using_gzip 5344 - -5344 static.mbr_test_run 6557 - -6557 sha1_process_one 8090 - -8090 sha256_process_one 9972 - -9972 ``` Raymond Mao (27): CI: Exclude MbedTLS subtree for CONFIG checks mbedtls: add mbedtls into the build system lib: Adapt digest header files to MbedTLS md5: Remove md5 non-watchdog API sha1: Remove sha1 non-watchdog API mbedtls: add digest shim layer for MbedTLS mbedtls: Enable smaller implementation for SHA256/512 mbedtls/external: support Microsoft Authentication Code mbedtls/external: support PKCS9 Authenticate Attributes mbedtls/external: support decoding multiple signer's cert mbedtls/external: update MbedTLS PKCS7 test suites public_key: move common functions to public key helper x509: move common functions to x509 helper pkcs7: move common functions to PKCS7 helper mbedtls: add public key porting layer lib/crypto: Adapt public_key header with MbedTLS mbedtls: add X509 cert parser porting layer lib/crypto: Adapt x509_cert_parser to MbedTLS mbedtls: add PKCS7 parser porting layer lib/crypto: Adapt PKCS7 parser to MbedTLS mbedtls: add MSCode parser porting layer lib/crypto: Adapt mscode_parser to MbedTLS mbedtls: add RSA helper layer on MbedTLS lib/rypto: Adapt rsa_helper to MbedTLS asn1_decoder: add build options for ASN1 decoder test: Remove ASN1 library test configs: enable MbedTLS as default setting .azure-pipelines.yml | 3 +- .gitlab-ci.yml | 3 +- Makefile | 6 + board/friendlyarm/nanopi2/board.c | 3 +- board/gdsys/a38x/hre.c | 2 +- board/intel/edison/edison.c | 3 +- board/xilinx/zynq/bootimg.c | 2 +- configs/qemu_arm64_defconfig | 1 + configs/sandbox_defconfig | 1 + drivers/mmc/Kconfig | 1 + include/crypto/mscode.h | 4 + include/crypto/pkcs7_parser.h | 56 ++ include/crypto/public_key.h | 6 + include/crypto/x509_parser.h | 55 ++ include/limits.h | 25 + include/linux/kernel.h | 13 +- include/stdlib.h | 1 + include/u-boot/md5.h | 14 +- include/u-boot/sha1.h | 37 +- include/u-boot/sha256.h | 20 + include/u-boot/sha512.h | 9 + lib/Kconfig | 4 + lib/Makefile | 15 +- lib/crypto/Makefile | 16 +- lib/crypto/asymmetric_type.c | 2 +- lib/crypto/pkcs7_helper.c | 37 ++ lib/crypto/pkcs7_parser.c | 28 - lib/crypto/public_key.c | 31 -- lib/crypto/public_key_helper.c | 39 ++ lib/crypto/x509_helper.c | 64 +++ lib/crypto/x509_public_key.c | 58 +- lib/mbedtls/Kconfig | 433 +++++++++++++++ lib/mbedtls/Makefile | 56 ++ .../external/mbedtls/include/mbedtls/oid.h | 35 ++ .../external/mbedtls/include/mbedtls/pkcs7.h | 21 + lib/mbedtls/external/mbedtls/library/pkcs7.c | 154 ++++-- .../tests/suites/test_suite_pkcs7.data | 4 +- lib/mbedtls/mbedtls_def_config.h | 90 ++++ lib/mbedtls/md5.c | 57 ++ lib/mbedtls/mscode_parser.c | 123 +++++ lib/mbedtls/pkcs7_parser.c | 506 ++++++++++++++++++ lib/mbedtls/port/assert.h | 12 + lib/mbedtls/port/md5_alt.h | 57 ++ lib/mbedtls/port/sha1_alt.h | 57 ++ lib/mbedtls/port/sha256_alt.h | 64 +++ lib/mbedtls/port/sha512_alt.h | 78 +++ lib/mbedtls/public_key.c | 82 +++ lib/mbedtls/rsa_helper.c | 95 ++++ lib/mbedtls/sha1.c | 99 ++++ lib/mbedtls/sha256.c | 62 +++ lib/mbedtls/sha512.c | 93 ++++ lib/mbedtls/x509_cert_parser.c | 447 ++++++++++++++++ lib/md5.c | 14 - lib/sha1.c | 13 - lib/tpm-v1.c | 2 +- test/Kconfig | 2 +- 56 files changed, 2983 insertions(+), 232 deletions(-) create mode 100644 include/limits.h create mode 100644 lib/crypto/pkcs7_helper.c create mode 100644 lib/crypto/public_key_helper.c create mode 100644 lib/crypto/x509_helper.c create mode 100644 lib/mbedtls/Kconfig create mode 100644 lib/mbedtls/Makefile create mode 100644 lib/mbedtls/mbedtls_def_config.h create mode 100644 lib/mbedtls/md5.c create mode 100644 lib/mbedtls/mscode_parser.c create mode 100644 lib/mbedtls/pkcs7_parser.c create mode 100644 lib/mbedtls/port/assert.h create mode 100644 lib/mbedtls/port/md5_alt.h create mode 100644 lib/mbedtls/port/sha1_alt.h create mode 100644 lib/mbedtls/port/sha256_alt.h create mode 100644 lib/mbedtls/port/sha512_alt.h create mode 100644 lib/mbedtls/public_key.c create mode 100644 lib/mbedtls/rsa_helper.c create mode 100644 lib/mbedtls/sha1.c create mode 100644 lib/mbedtls/sha256.c create mode 100644 lib/mbedtls/sha512.c create mode 100644 lib/mbedtls/x509_cert_parser.c -- 2.25.1

5 55

[PATCH 0/6] Allow showing the memory map
by Simon Glass 15 Oct '24

15 Oct '24

This little series adds a new 'memmap' command, intended to show the layout of memory within U-Boot and how much memory is available for loading images. Simon Glass (6): common: Fix up malloc() comment in reserve_noncached() common: Tidy up how malloc() is inited am65x: Use map_to_sysmem() to convert from pointer global_data: Add some more accessors bootstage: Allow counting memory without strings cmd: Add a command to show the memory map arch/arm/mach-k3/am65x/am654_init.c | 11 +-- cmd/Kconfig | 10 +++ cmd/Makefile | 1 + cmd/memmap.c | 66 +++++++++++++++ common/board_f.c | 8 +- common/board_r.c | 3 +- common/bootstage.c | 16 ++-- common/dlmalloc.c | 8 +- common/spl/spl.c | 4 +- doc/usage/cmd/memmap.rst | 123 ++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + include/asm-generic/global_data.h | 30 +++++++ include/bootstage.h | 5 +- include/malloc.h | 8 ++ test/cmd/Makefile | 3 +- test/cmd/memmap.c | 35 ++++++++ 16 files changed, 305 insertions(+), 27 deletions(-) create mode 100644 cmd/memmap.c create mode 100644 doc/usage/cmd/memmap.rst create mode 100644 test/cmd/memmap.c -- 2.43.0

3 20

2024.10 fails to boot on starfive visionfive2
by Andreas Schwab 15 Oct '24

15 Oct '24

Trying to boot 2024.10 on the starfive visionfive2 1.2a board from flash fails: U-Boot SPL 2024.10 (Oct 08 2024 - 07:10:55 +0000) DDR version: dc2e84f0. Trying to boot from SPI SPI probe failed. SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ### I can boot 2024.10 successfully from SD card, but using it to flash u-boot (no matter which version) will produce a bad flash: Main section boot fail,use backup section In order to produce a working boot from flash I have to use u-boot 2024.07 (or earlier) to reflash it. -- Andreas Schwab, SUSE Labs, schwab(a)suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."

1 1

[PATCH v4 0/5] android_ab: introduce bcb ab_dump command and provide several bcb fixes
by Dmitry Rokosov 15 Oct '24

15 Oct '24

The patch series include changes: - move ab_select_slot() documentation to @ notation - move ab_select command to bcb subcommands - introduce the ab_dump command to print the content of the BCB block; it's useful for debugging A/B logic on supported boards - fix the slot suffix format in the ABC block to align with official Android BCB specifications - add a test for the ab_dump command to verify the accuracy of each field within the ABC data displayed, it's also useful for testing slot_suffix problem code paths Changes v3 since v2 at [2]: - return "Legend" block for bcb command - additionally, verify the CONFIG_ANDROID_AB configuration alongside CONFIG_CMD_BCB to ensure that the A/B scheme is used for the designated board. Changes v2 since v1 at [1]: - move ab_select_slot() documentation to @ notation - move ab_select command to bcb subcommands per Simon and Mattijs suggestions - redesign ab_dump as bcb subcommand - use spaces instead of tabs in the ab_dump command output - print hex values in the lowercase - add RvB tags Links: [1] https://lore.kernel.org/all/20240725194716.32232-1-ddrokosov@salutedevices.… [2] https://lore.kernel.org/all/20240911214945.15873-1-ddrokosov@salutedevices.… Signed-off-by: Dmitry Rokosov <ddrokosov(a)salutedevices.com> --- Changes in v4: - add #ifdefs for CONFIG_ANDROID_AB in cmd/bcb.c to allow the usage of the bcb command without A/B enabled - run the savedefconfig command for all defconfigs that include the CMD_BCB configuration - resolve merge conflicts with latest master - provide additional trailers from the previous version (excluding changed patches) - Link to v3: https://lore.kernel.org/r/20241008-android_ab_master-v3-0-f292c45a33e4@salu… --- Dmitry Rokosov (5): include/android_ab: move ab_select_slot() documentation to @ notation treewide: bcb: move ab_select command to bcb subcommands cmd: bcb: change strcmp() usage style in the do_bcb_ab_select() cmd: bcb: introduce 'ab_dump' command to print BCB block content common: android_ab: fix slot suffix for abc block MAINTAINERS | 1 - boot/android_ab.c | 116 ++++++++++++++++++++++++------ cmd/Kconfig | 14 ---- cmd/Makefile | 1 - cmd/ab_select.c | 66 ----------------- cmd/bcb.c | 110 ++++++++++++++++++++++++++++ configs/am57xx_evm_defconfig | 1 - configs/am57xx_hs_evm_defconfig | 1 - configs/am57xx_hs_evm_usb_defconfig | 1 - configs/khadas-vim3_android_ab_defconfig | 1 - configs/khadas-vim3l_android_ab_defconfig | 1 - configs/sandbox64_defconfig | 2 + configs/sandbox_defconfig | 1 - doc/android/ab.rst | 12 ++-- include/android_ab.h | 17 ++++- include/configs/khadas-vim3_android.h | 2 +- include/configs/khadas-vim3l_android.h | 2 +- include/configs/meson64_android.h | 4 +- include/configs/ti_omap5_common.h | 4 +- test/py/tests/test_android/test_ab.py | 31 ++++++-- 20 files changed, 260 insertions(+), 128 deletions(-) --- base-commit: 5d899fc58c44fe5623e31524da2205d8597a53d1 change-id: 20241008-android_ab_master-d86d71c839ae Best regards, -- Dmitry Rokosov <ddrokosov(a)salutedevices.com>

2 6

[PATCH] TI: include: env: ti_common: move fdtoverlay_addr_r to fix ramdisk size
by Judith Mendez 15 Oct '24

15 Oct '24

From: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> When booting Android with adtbo_idx set, we observe the following crash: ** Booting bootflow 'mmc(a)fa10000.bootdev.whole' with android ## Booting Android Image at 0x82000000 ... Kernel load addr 0x92000000 size 20195 KiB Kernel extra command line: console=ttyS2,115200 cma=768M 8250. nr_uarts=10 printk.devkmsg=on init=/init quiet firmware_class. path=/vendor/firmware mem_sleep_default=deep bootconfig RAM disk load addr 0x88080000 size 16901 KiB "Synchronous Abort" handler, esr 0x96000005, far 0x155b104c8 elr: 0000000080808560 lr : 0000000080808558 (reloc) elr: 00000000ffebf560 lr : 00000000ffebf558 x0 : 00000000fff99000 x1 : 00000000fff9553c x2 : 000000000000000a x3 : 0000000002800000 x4 : 0000000002800000 x5 : 0000000000000020 This happens because the memory at fdtoverlay_addr_r is bogus. In fact: => printenv fdtoverlay_addr_r fdtoverlay_addr_r=0x89000000 And the ramdisk address range is: [0x88080000; 0x88080000 + 16901 KiB] Which is equal to: [0x88080000; 0x89101400] So, if we represent the addresses: fdtaddr 0x88000000 ramdisk 0x88080000 fdtoverlay_addr_r 0x89000000 ramisk (end) 0x89101400 We see that fdtoverlay_addr_r in fact has been overridden by the Android ramdisk. The maximum ramdisk size is 0x1080000 (15,5 MiB) and a compressed Android vendor ramdisk is 15MiB: $ file vendor_ramdisk.img vendor_ramdisk.img: LZ4 compressed data (v0.1-v0.9) $ du -sh vendor_ramdisk.img 15M vendor_ramdisk.img When it gets decompressed, it uses 16.5MiB, exceeding the maximum ramdisk size. Increase the maximum ramdisk size to 20.5MiB by moving fdtoverlay_addr_r higher up in the address space to fix the crash. Signed-off-by: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> Signed-off-by: Judith Mendez <jm(a)ti.com> --- include/env/ti/ti_common.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/env/ti/ti_common.env b/include/env/ti/ti_common.env index 7029d12bf20..a15af79d9c3 100644 --- a/include/env/ti/ti_common.env +++ b/include/env/ti/ti_common.env @@ -3,7 +3,7 @@ kernel_addr_r=0x82000000 fdtaddr=0x88000000 dtboaddr=0x89000000 fdt_addr_r=0x88000000 -fdtoverlay_addr_r=0x89000000 +fdtoverlay_addr_r=0x89500000 rdaddr=0x88080000 ramdisk_addr_r=0x88080000 scriptaddr=0x80000000 base-commit: a404065479be2c1fe1167c3c91367e8194a69d1b -- 2.46.2

3 3

[PATCH v2] dts: Deduplicate dtbs target
by Marek Vasut 15 Oct '24

15 Oct '24

The dtbs: target is almost identical in all architecture Makefiles. All architecture Makefiles include scripts/Makefile.dts . Deduplicate the dtbs: target into scripts/Makefile.dts . No functional change. Reviewed-by: Sumit Garg <sumit.garg(a)linaro.org> Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: "NXP i.MX U-Boot Team" <uboot-imx(a)nxp.com> Cc: Caleb Connolly <caleb.connolly(a)linaro.org> Cc: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Jonas Karlman <jonas(a)kwiboo.se> Cc: Lothar Rubusch <l.rubusch(a)gmail.com> Cc: Michal Simek <michal.simek(a)amd.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> Cc: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Sumit Garg <sumit.garg(a)linaro.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de --- V2: Add RB from Sumit NOTE: I am sending this separately --- arch/arc/dts/Makefile | 9 +-------- arch/arm/dts/Makefile | 8 -------- arch/m68k/dts/Makefile | 9 +-------- arch/microblaze/dts/Makefile | 9 +-------- arch/mips/dts/Makefile | 8 -------- arch/nios2/dts/Makefile | 9 +-------- arch/powerpc/dts/Makefile | 8 -------- arch/riscv/dts/Makefile | 9 +-------- arch/sandbox/dts/Makefile | 9 +-------- arch/sh/dts/Makefile | 8 -------- arch/x86/dts/Makefile | 8 -------- arch/xtensa/dts/Makefile | 8 -------- dts/upstream/src/arm/Makefile | 8 -------- dts/upstream/src/arm64/Makefile | 8 -------- dts/upstream/src/xtensa/Makefile | 8 -------- scripts/Makefile.dts | 8 ++++++++ 16 files changed, 14 insertions(+), 120 deletions(-) diff --git a/arch/arc/dts/Makefile b/arch/arc/dts/Makefile index 532a8131c59..fe6ad7b849a 100644 --- a/arch/arc/dts/Makefile +++ b/arch/arc/dts/Makefile @@ -10,12 +10,5 @@ dtb-$(CONFIG_TARGET_IOT_DEVKIT) += iot_devkit.dtb include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - +# Add any required device tree compiler flags here DTC_FLAGS += -R 4 -p 0x1000 - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := *.dtb diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index d69b53ce8f7..e1cf4a43c23 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1305,16 +1305,8 @@ dtb-$(CONFIG_TARGET_CORSTONE1000) += corstone1000-mps3.dtb \ include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - # Add any required device tree compiler flags here DTC_FLAGS += -a 0x8 DTC_FLAGS_imx8mp-dhcom-som-overlay-rev100 += -Wno-avoid_default_addr_size -Wno-reg_format DTC_FLAGS_imx8mp-dhcom-pdk3-overlay-rev100 += -Wno-avoid_default_addr_size -Wno-reg_format - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := *.dtb *.dtbo *_HS diff --git a/arch/m68k/dts/Makefile b/arch/m68k/dts/Makefile index 7988522eb98..8b354b9c570 100644 --- a/arch/m68k/dts/Makefile +++ b/arch/m68k/dts/Makefile @@ -20,12 +20,5 @@ dtb-$(CONFIG_TARGET_STMARK2) += stmark2.dtb include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - +# Add any required device tree compiler flags here DTC_FLAGS += -R 4 -p 0x1000 - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := *.dtb diff --git a/arch/microblaze/dts/Makefile b/arch/microblaze/dts/Makefile index 427a8f9aaca..9be902d3bb1 100644 --- a/arch/microblaze/dts/Makefile +++ b/arch/microblaze/dts/Makefile @@ -4,12 +4,5 @@ dtb-y += $(shell echo $(CONFIG_DEFAULT_DEVICE_TREE)).dtb include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - +# Add any required device tree compiler flags here DTC_FLAGS += -R 4 -p 0x1000 - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := *.dtb diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile index 14fbce597b9..752e771514f 100644 --- a/arch/mips/dts/Makefile +++ b/arch/mips/dts/Makefile @@ -39,13 +39,5 @@ dtb-$(CONFIG_SOC_SERVAL) += serval_pcb105.dtb serval_pcb106.dtb include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - # Add any required device tree compiler flags here DTC_FLAGS += - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := *.dtb diff --git a/arch/nios2/dts/Makefile b/arch/nios2/dts/Makefile index 2b29fa90f6c..d77db9762a1 100644 --- a/arch/nios2/dts/Makefile +++ b/arch/nios2/dts/Makefile @@ -4,12 +4,5 @@ dtb-y += $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%).dtb include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - +# Add any required device tree compiler flags here DTC_FLAGS += -R 4 -p 0x1000 - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := *.dtb diff --git a/arch/powerpc/dts/Makefile b/arch/powerpc/dts/Makefile index 321c644804e..766b0c05951 100644 --- a/arch/powerpc/dts/Makefile +++ b/arch/powerpc/dts/Makefile @@ -35,13 +35,5 @@ dtb-$(CONFIG_TARGET_CMPCPRO) += cmpcpro.dtb include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - # Add any required device tree compiler flags here DTC_FLAGS += - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := *.dtb diff --git a/arch/riscv/dts/Makefile b/arch/riscv/dts/Makefile index c4c44057bad..f3dfd751cb4 100644 --- a/arch/riscv/dts/Makefile +++ b/arch/riscv/dts/Makefile @@ -15,12 +15,5 @@ dtb-$(CONFIG_TARGET_ASPEED_AST2700_IBEX) += ast2700-ibex.dtb include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - +# Add any required device tree compiler flags here DTC_FLAGS += -R 4 -p 0x1000 - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := *.dtb diff --git a/arch/sandbox/dts/Makefile b/arch/sandbox/dts/Makefile index f810b4752f5..1c9fb4a4566 100644 --- a/arch/sandbox/dts/Makefile +++ b/arch/sandbox/dts/Makefile @@ -10,12 +10,5 @@ dtb-$(CONFIG_CMD_EXTENSION) += overlay0.dtbo overlay1.dtbo include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - +# Add any required device tree compiler flags here DTC_FLAGS += -R 4 -p 0x1000 - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := *.dtb *.dtbo diff --git a/arch/sh/dts/Makefile b/arch/sh/dts/Makefile index 144fd3e7d22..e9153e42534 100644 --- a/arch/sh/dts/Makefile +++ b/arch/sh/dts/Makefile @@ -2,13 +2,5 @@ dtb-y += sh7751-r2dplus.dtb include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - # Add any required device tree compiler flags here DTC_FLAGS += - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := *.dtb *_HS diff --git a/arch/x86/dts/Makefile b/arch/x86/dts/Makefile index cd77f4c4e81..9a46726e026 100644 --- a/arch/x86/dts/Makefile +++ b/arch/x86/dts/Makefile @@ -24,12 +24,4 @@ dtb-y += bayleybay.dtb \ include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - DTC_FLAGS += -R 4 -p $(if $(CONFIG_EFI_APP),0x8000,0x1000) - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := *.dtb diff --git a/arch/xtensa/dts/Makefile b/arch/xtensa/dts/Makefile index c22c50ac4e5..aa582b85e5c 100644 --- a/arch/xtensa/dts/Makefile +++ b/arch/xtensa/dts/Makefile @@ -4,12 +4,4 @@ dtb-$(CONFIG_XTENSA) += ml605.dtb ml605_nommu.dtb kc705.dtb kc705_nommu.dtb include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - DTC_FLAGS += - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := *.dtb diff --git a/dts/upstream/src/arm/Makefile b/dts/upstream/src/arm/Makefile index 9a8f6aa3584..c86a2be5d85 100644 --- a/dts/upstream/src/arm/Makefile +++ b/dts/upstream/src/arm/Makefile @@ -2,13 +2,5 @@ include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - # Add any required device tree compiler flags here DTC_FLAGS += -a 0x8 - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := */*.dtb */*.dtbo diff --git a/dts/upstream/src/arm64/Makefile b/dts/upstream/src/arm64/Makefile index 26a83d3d29d..b6db0dc6b26 100644 --- a/dts/upstream/src/arm64/Makefile +++ b/dts/upstream/src/arm64/Makefile @@ -2,17 +2,9 @@ include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - # Add any required device tree compiler flags here DTC_FLAGS += -a 0x8 ifdef CONFIG_RCAR_64 DTC_FLAGS += -R 4 -p 0x1000 endif - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := */*.dtb */*.dtbo diff --git a/dts/upstream/src/xtensa/Makefile b/dts/upstream/src/xtensa/Makefile index 2a81acb32bc..c86a2be5d85 100644 --- a/dts/upstream/src/xtensa/Makefile +++ b/dts/upstream/src/xtensa/Makefile @@ -2,13 +2,5 @@ include $(srctree)/scripts/Makefile.dts -targets += $(dtb-y) - # Add any required device tree compiler flags here DTC_FLAGS += -a 0x8 - -PHONY += dtbs -dtbs: $(addprefix $(obj)/, $(dtb-y)) - @: - -clean-files := *.dtb *.dtbo */*.dtb */*.dtbo diff --git a/scripts/Makefile.dts b/scripts/Makefile.dts index 790f3c508f1..1fe142f2bbf 100644 --- a/scripts/Makefile.dts +++ b/scripts/Makefile.dts @@ -14,3 +14,11 @@ dtb-vendor_dts := $(patsubst %.dts,%.dtb,$(wildcard $(dt_dir)/$(subst ",,$(CONFI dtb-y += $(subst $(dt_dir)/,,$(dtb-vendor_dts)) endif + +targets += $(dtb-y) + +PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y)) + @: + +clean-files := *.dtb *.dtbo */*.dtb */*.dtbo *_HS -- 2.45.2

4 4

[2nd RESEND PATCH v2 0/6] mtd: Make sure UBIFS does not do multi-pass page programming on flashes that don't support it
by tkuw584924＠gmail.com 15 Oct '24

15 Oct '24

From: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> Resent after modifying commit message in #5 (mention Linux commit first) and collecting A-b tags. This series is equivalent to the one for Linux MTD submitted by Pratyush Yadav. https://patchwork.ozlabs.org/project/linux-mtd/list/?series=217759&state=* Changes in v2: - Fix an issue in setting macronix_octal_fixups - Rework fixup hooks Takahiro Kuwano (6): mtd: ubi: Do not zero out EC and VID on ECC-ed NOR flashes mtd: spi-nor: Allow flashes to specify MTD writesize mtd: spi-nor: Check nor->info before setting macronix_octal_fixups mtd: spi-nor: Replace default_init() hook with late_init() mtd: spi-nor: Call spi_nor_post_sfdp_fixups() only after spi_nor_parse_sfdp() mtd: spi-nor: Set ECC unit size to MTD writesize in Infineon SEMPER flashes drivers/mtd/spi/spi-nor-core.c | 88 +++++++++++++++++++++------------- drivers/mtd/ubi/build.c | 4 +- drivers/mtd/ubi/io.c | 9 +++- include/linux/mtd/spi-nor.h | 1 + 4 files changed, 65 insertions(+), 37 deletions(-) -- 2.34.1

3 8

[PATCH] boardf: Modify DRAM message
by Neha Malcom Francis 15 Oct '24

15 Oct '24

The message "DRAM: 2 GiB (effective 32 GiB)" can be a little confusing, modify the message to show exactly what is meant: "DRAM: 2 GiB (available for U-Boot out of total 32 GiB)" Signed-off-by: Neha Malcom Francis <n-francis(a)ti.com> --- common/board_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/board_f.c b/common/board_f.c index 154675d0e40..b7add8f7d3d 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -254,7 +254,7 @@ static int show_dram_config(void) print_size(gd->ram_size, ""); if (!sizes_near(gd->ram_size, size)) { - printf(" (effective "); + printf(" (available for U-Boot out of total "); print_size(size, ")"); } board_add_ram_info(0); -- 2.34.1

7 14

[Regression] rk3588 failed to boot linux
by Andy Yan 15 Oct '24

15 Oct '24

When test with current main branch on rk3588 based coolpi 4b, the board failed to boot linux os[0]: I do the same test on another board that is preparing to send patches upstream, and it also failed. The two boards boots fine with v2024.10. With some bisect, it seems that this issue is caused by: commit 360aaddd9cea8c256f50c576794415cadfb61819 Merge: 2c832abc732 f8ffc6f3cc4 Author: Tom Rini <trini(a)konsulko.com> Date: Tue Sep 3 14:09:30 2024 -0600 Merge patch series "Make LMB memory map global and persistent" Sughosh Ganu <sughosh.ganu(a)linaro.org> says: My boards boot fine before this merge on u-boot/next, and all failed to boot linux after this merge. I am not familiar with the LMB mechanism, so i don't know how to find the root case now. I dump the bdinfo for both good case[1] and gegression case[2], not sure if they are usefull for debug this issue. [0] Synchronous Abort when starting kernel: Scanning bootdev 'mmc(a)fe2c0000.bootdev': Card did not respond to voltage select! : -110 Scanning bootdev 'mmc(a)fe2e0000.bootdev': 1 script ready mmc 1 mmc(a)fe2e0000.bootdev.part /boot/boot.scr ** Booting bootflow 'mmc(a)fe2e0000.bootdev.part_1' with script Boot script loaded from mmc 0:1 224 bytes read in 7 ms (31.3 KiB/s) 26510301 bytes read in 97 ms (260.6 MiB/s) 32883200 bytes read in 122 ms (257 MiB/s) 148323 bytes read in 30 ms (4.7 MiB/s) Working FDT set to 12000000 Trying kaslrseed command... Info: Unknown command can be safely ignored since kaslrseed does not apply to all boards. Unknown command 'kaslrseed' - try 'help' ## Loading init Ramdisk from Legacy Image at 12180000 ... Image Name: uInitrd Image Type: AArch64 Linux RAMDisk Image (gzip compressed) Data Size: 26510237 Bytes = 25.3 MiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 12000000 Booting using the fdt blob at 0x12000000 Working FDT set to 12000000 Loading Ramdisk to eb58f000, end eced739d ... OK Loading Device Tree to 00000000eb502000, end 00000000eb58efff ... OK Working FDT set to eb502000 Starting kernel ... "Synchronous Abort" handler, esr 0x96000004, far 0x96142b896930b907 elr: 0000000000a8d3b8 lr : 0000000000a77450 (reloc) elr: 00000000effa13b8 lr : 00000000eff8b450 x0 : 96142b896930b907 x1 : 00000000effab870 x2 : 0000000000000010 x3 : 00000000edf47310 x4 : 0000000000000000 x5 : 96142b896930b907 x6 : 0000000000000007 x7 : 0000000000000004 x8 : 0000000000000040 x9 : fffffffffffffff0 x10: 00000000eb526fff x11: 00000000edf3a808 x12: 0000000000000006 x13: 00000000eb502000 x14: 00000000ffffffff x15: 00000000ededb588 x16: 00000000eff68738 x17: 0000000000000000 x18: 00000000edef4d70 x19: 00000000eceb4040 x20: 00000000eff14f50 x21: 00000000eceac000 x22: 00000000effcc000 x23: 0000000000000001 x24: 0000000000000001 x25: 0000000000200000 x26: 00000000edf385c0 x27: 00000000eced8000 x28: 00000000eced9000 x29: 00000000ededb3c0 Code: eb04005f 54000061 52800000 14000006 (386468a3) Resetting CPU ... [1] bdinfo for success boot => bdinfo boot_params = 0x0000000000000000 DRAM bank = 0x0000000000000000 -> start = 0x0000000000200000 -> size = 0x00000000efe00000 DRAM bank = 0x0000000000000001 -> start = 0x00000001f0000000 -> size = 0x0000000010000000 flashstart = 0x0000000000000000 flashsize = 0x0000000000000000 flashoffset = 0x0000000000000000 baudrate = 1500000 bps relocaddr = 0x00000000eff14000 reloc off = 0x00000000ef514000 Build = 64-bit current eth = unknown eth-1addr = (not set) IP addr = <NULL> fdt_blob = 0x00000000ededcd80 new_fdt = 0x00000000ededcd80 fdt_size = 0x0000000000017fa0 lmb_dump_all: memory.cnt = 0x2 / max = 0x10 memory[0] [0x200000-0xefffffff], 0xefe00000 bytes flags: 0 memory[1] [0x1f0000000-0x1ffffffff], 0x10000000 bytes flags: 0 reserved.cnt = 0x2 / max = 0x10 reserved[0] [0xeced8000-0xefffffff], 0x03128000 bytes flags: 0 reserved[1] [0x1f0000000-0x1ffffffff], 0x10000000 bytes flags: 0 devicetree = separate serial addr = 0x00000000feb50000 width = 0x0000000000000004 shift = 0x0000000000000002 offset = 0x0000000000000000 clock = 0x00000000016e3600 arch_number = 0x0000000000000000 TLB addr = 0x00000000efff0000 irq_sp = 0x00000000ededcd70 sp start = 0x00000000ededcd70 Early malloc usage: 2440 / 10000 => [2] bdinfo for boot failed case; => bdinfo boot_params = 0x0000000000000000 DRAM bank = 0x0000000000000000 -> start = 0x0000000000200000 -> size = 0x00000000efe00000 DRAM bank = 0x0000000000000001 -> start = 0x00000001f0000000 -> size = 0x0000000010000000 flashstart = 0x0000000000000000 flashsize = 0x0000000000000000 flashoffset = 0x0000000000000000 baudrate = 1500000 bps relocaddr = 0x00000000eff14000 reloc off = 0x00000000ef514000 Build = 64-bit current eth = unknown eth-1addr = (not set) IP addr = <NULL> fdt_blob = 0x00000000ededc1b0 lmb_dump_all: memory.count = 0x1 memory[0] [0x200000-0xefffffff], 0xefe00000 bytes flags: none reserved.count = 0x1 reserved[0] [0xeced81a0-0xefffffff], 0x03127e60 bytes flags: no-overwrite devicetree = separate serial addr = 0x00000000feb50000 width = 0x0000000000000004 shift = 0x0000000000000002 offset = 0x0000000000000000 clock = 0x00000000016e3600 arch_number = 0x0000000000000000 TLB addr = 0x00000000efff0000 irq_sp = 0x00000000ededc1a0 sp start = 0x00000000ededc1a0 Early malloc usage: 2440 / 10000 -- 2.34.1

4 9