46 files changed, 1414 insertions, 814 deletions

diff --git a/bitbake/bin/bitbake-setup b/bitbake/bin/bitbake-setup
index e7b955213e..71b5b8de9f 100755
--- a/bitbake/bin/bitbake-setup
+++ b/bitbake/bin/bitbake-setup
@@ -32,9 +32,9 @@ logger = bb.msg.logger_create('bitbake-setup', sys.stdout)
 def cache_dir(top_dir):
     return os.path.join(top_dir, '.bitbake-setup-cache')
 
-def init_bb_cache(settings, args):
+def init_bb_cache(top_dir, settings, args):
     dldir = settings["default"]["dl-dir"]
-    bb_cachedir = os.path.join(cache_dir(args.top_dir), 'bitbake-cache')
+    bb_cachedir = os.path.join(cache_dir(top_dir), 'bitbake-cache')
 
     d = bb.data.init()
     d.setVar("DL_DIR", dldir)
@@ -162,8 +162,31 @@ def setup_bitbake_build(bitbake_config, layerdir, builddir, thisdir):
         builddir = os.path.realpath(builddir)
         cmd = "cd {}\nset {}\n. ./oe-init-build-env\n".format(oeinitbuildenvdir, builddir)
         initbuild_in_builddir = os.path.join(builddir, 'init-build-env')
+
+        with open(initbuild_in_builddir, 'w') as f:
+            f.write("# init-build-env wrapper created by bitbake-setup\n")
+            f.write(cmd + '\n')
+
+    def _prepend_passthrough_to_init_build_env(builddir):
+        env = bitbake_config.get("bb-env-passthrough-additions")
+        if not env:
+            return
+
+        initbuild_in_builddir = os.path.join(builddir, 'init-build-env')
+        with open(initbuild_in_builddir) as f:
+            content = f.read()
+
+        joined = " \\\n".join(env)
+        env = "export BB_ENV_PASSTHROUGH_ADDITIONS=\" \\\n"
+        env += "${BB_ENV_PASSTHROUGH_ADDITIONS} \\\n"
+        env += joined
+        env += '"'
+
         with open(initbuild_in_builddir, 'w') as f:
-            f.write(cmd)
+            f.write("# environment passthrough added by bitbake-setup\n")
+            f.write(env + '\n')
+            f.write('\n')
+            f.write(content)
 
     bitbake_builddir = os.path.join(builddir, "build")
     print("Setting up bitbake configuration in\n    {}\n".format(bitbake_builddir))
@@ -194,6 +217,8 @@ def setup_bitbake_build(bitbake_config, layerdir, builddir, thisdir):
             return
         _make_init_build_env(bitbake_builddir, os.path.realpath(oeinitbuildenvdir))
 
+    _prepend_passthrough_to_init_build_env(bitbake_builddir)
+
     siteconf_symlink = os.path.join(bitbake_confdir, "site.conf")
     siteconf = os.path.normpath(os.path.join(builddir, '..', "site.conf"))
     if os.path.lexists(siteconf_symlink):
@@ -364,7 +389,7 @@ def choose_fragments(possibilities, parameters, non_interactive, skip_selection)
         choices[k] = options_enumerated[option_n][1]
     return choices
 
-def obtain_config(settings, args, source_overrides, d):
+def obtain_config(top_dir, settings, args, source_overrides, d):
     if args.config:
         config_id = args.config[0]
         config_parameters = args.config[1:]
@@ -382,7 +407,7 @@ def obtain_config(settings, args, source_overrides, d):
               upstream_config = {'type':'network','uri':config_id,'name':get_config_name(config_id),'data':json.load(f)}
         else:
             print("Looking up config {} in configuration registry".format(config_id))
-            registry_path = update_registry(settings["default"]["registry"], cache_dir(args.top_dir), d)
+            registry_path = update_registry(settings["default"]["registry"], cache_dir(top_dir), d)
             registry_configs = list_registry(registry_path, with_expired=True)
             if config_id not in registry_configs:
                 raise Exception("Config {} not found in configuration registry, re-run 'init' without parameters to choose from available configurations.".format(config_id))
@@ -391,7 +416,7 @@ def obtain_config(settings, args, source_overrides, d):
         if has_expired(expiry_date):
             print("This configuration is no longer supported after {}. Please consider changing to a supported configuration.".format(expiry_date))
     else:
-        registry_path = update_registry(settings["default"]["registry"], cache_dir(args.top_dir), d)
+        registry_path = update_registry(settings["default"]["registry"], cache_dir(top_dir), d)
         registry_configs = list_registry(registry_path, with_expired=True)
         config_id = choose_config(registry_configs, args.non_interactive)
         config_parameters = []
@@ -404,18 +429,19 @@ def obtain_config(settings, args, source_overrides, d):
     upstream_config['skip-selection'] = args.skip_selection
     return upstream_config
 
-def init_config(settings, args, d):
+def init_config(top_dir, settings, args, d):
     stdout = sys.stdout
     def handle_task_progress(event, d):
         rate = event.rate if event.rate else ''
         progress = event.progress if event.progress > 0 else 0
         print("{}% {}                ".format(progress, rate), file=stdout, end='\r')
 
+    create_siteconf(top_dir, args.non_interactive)
     source_overrides = json.load(open(args.source_overrides)) if args.source_overrides else {'sources':{}}
-    upstream_config = obtain_config(settings, args, source_overrides, d)
+    upstream_config = obtain_config(top_dir, settings, args, source_overrides, d)
     print("\nRun 'bitbake-setup init --non-interactive {}' to select this configuration non-interactively.\n".format(" ".join(upstream_config['non-interactive-cmdline-options'])))
 
-    builddir = os.path.join(os.path.abspath(args.top_dir), args.build_dir_name or "{}-{}".format(upstream_config['name']," ".join(upstream_config['non-interactive-cmdline-options'][1:]).replace(" ","-").replace("/","_")))
+    builddir = os.path.join(os.path.abspath(top_dir), args.build_dir_name or "{}-{}".format(upstream_config['name']," ".join(upstream_config['non-interactive-cmdline-options'][1:]).replace(" ","-").replace("/","_")))
     if os.path.exists(os.path.join(builddir, "layers")):
         print("Build already initialized in {}\nUse 'bitbake-setup status' to check if it needs to be updated or 'bitbake-setup update' to perform the update.".format(builddir))
         return
@@ -486,7 +512,7 @@ def are_layers_changed(layers, layerdir, d):
 
     return changed
 
-def build_status(settings, args, d, update=False):
+def build_status(top_dir, settings, args, d, update=False):
     builddir = args.build_dir
 
     confdir = os.path.join(builddir, "config")
@@ -498,7 +524,7 @@ def build_status(settings, args, d, update=False):
     args.non_interactive = True
     args.skip_selection = current_upstream_config['skip-selection']
     source_overrides = current_upstream_config["source-overrides"]
-    new_upstream_config = obtain_config(settings, args, source_overrides, d)
+    new_upstream_config = obtain_config(top_dir, settings, args, source_overrides, d)
 
     write_config(new_upstream_config, confdir)
     config_diff = bb.process.run('git -C {} diff'.format(confdir))[0]
@@ -519,8 +545,8 @@ def build_status(settings, args, d, update=False):
 
     print("\nConfiguration in {} has not changed.".format(builddir))
 
-def build_update(settings, args, d):
-    build_status(settings, args, d, update=True)
+def build_update(top_dir, settings, args, d):
+    build_status(top_dir, settings, args, d, update=True)
 
 def do_fetch(fetcher, dir):
     # git fetcher simply dumps git output to stdout; in bitbake context that is redirected to temp/log.do_fetch
@@ -570,8 +596,8 @@ def list_registry(registry_path, with_expired):
                     json_data[config_name] = {"description": config_desc}
     return json_data
 
-def list_configs(settings, args, d):
-    registry_path = update_registry(settings["default"]["registry"], cache_dir(args.top_dir), d)
+def list_configs(top_dir, settings, args, d):
+    registry_path = update_registry(settings["default"]["registry"], cache_dir(top_dir), d)
     json_data = list_registry(registry_path, args.with_expired)
     print("\nAvailable configurations:")
     for config_name, config_data in json_data.items():
@@ -589,7 +615,7 @@ def list_configs(settings, args, d):
             json.dump(json_data, f, sort_keys=True, indent=4)
         print("Available configurations written into {}".format(args.write_json))
 
-def install_buildtools(settings, args, d):
+def install_buildtools(top_dir, settings, args, d):
     buildtools_install_dir = os.path.join(args.build_dir, 'buildtools')
     if os.path.exists(buildtools_install_dir):
         if not args.force:
@@ -609,117 +635,68 @@ def install_buildtools(settings, args, d):
     subprocess.check_call("{} -d {} --downloads-directory {}".format(install_buildtools, buildtools_install_dir, buildtools_download_dir), shell=True)
 
 def default_settings_path(top_dir):
-    return os.path.join(top_dir, 'bitbake-setup.conf')
-
-def write_settings(top_dir, force_replace, non_interactive=True):
-    settings_path = default_settings_path(top_dir)
-    if not os.path.exists(settings_path) or force_replace:
-
-        settings = configparser.ConfigParser()
-        settings['default'] = {
-                             'registry':default_registry,
-                             'dl-dir':os.path.join(top_dir, '.bitbake-setup-downloads'),
-                            }
-        os.makedirs(os.path.dirname(settings_path), exist_ok=True)
-
-        siteconfpath = os.path.join(top_dir, 'site.conf')
-        print('Configuration registry set to\n    {}\n'.format(settings['default']['registry']))
-        print('Bitbake-setup download cache (DL_DIR) set to\n    {}\n'.format(settings['default']['dl-dir']))
-        print('A new settings file will be created in\n    {}\n'.format(settings_path))
-        print('A common site.conf file will be created, please edit or replace before running builds\n    {}\n'.format(siteconfpath))
-        if not non_interactive:
-            y_or_n = input('Bitbake-setup will be configured with the above settings in {}, (y/N): '.format(top_dir))
-            if y_or_n != 'y':
-                print("\nYou can run 'bitbake-setup install-settings' to edit them before setting up builds")
-                exit()
-            print()
-
-        if os.path.exists(settings_path):
-            backup_conf = settings_path + "-backup.{}".format(time.strftime("%Y%m%d%H%M%S"))
-            os.rename(settings_path, backup_conf)
-            print("Previous settings are in {}".format(backup_conf))
-        with open(settings_path, 'w') as settingsfile:
-            settings.write(settingsfile)
-
-        if os.path.exists(siteconfpath):
-            backup_siteconf = siteconfpath + "-backup.{}".format(time.strftime("%Y%m%d%H%M%S"))
-            os.rename(siteconfpath, backup_siteconf)
-            print("Previous settings are in {}".format(backup_siteconf))
-        with open(siteconfpath, 'w') as siteconffile:
-            siteconffile.write('# This file is intended for build host-specific bitbake settings\n')
-
-def load_settings(top_dir, non_interactive):
-    # This creates a new settings file if it does not yet exist
-    write_settings(top_dir, force_replace=False, non_interactive=non_interactive)
-
-    settings_path = default_settings_path(top_dir)
-    settings = configparser.ConfigParser()
-    print('Loading settings from\n    {}\n'.format(settings_path))
-    settings.read_file(open(settings_path))
-    return settings
+    return os.path.join(top_dir, 'settings.conf')
+
+def create_siteconf(top_dir, non_interactive=True):
+    siteconfpath = os.path.join(top_dir, 'site.conf')
+    print('A common site.conf file will be created, please edit or replace before running builds\n    {}\n'.format(siteconfpath))
+    if not non_interactive:
+        y_or_n = input('Proceed? (y/N): ')
+        if y_or_n != 'y':
+            exit()
+
+    os.makedirs(os.path.dirname(top_dir), exist_ok=True)
+    if os.path.exists(siteconfpath):
+        backup_siteconf = siteconfpath + "-backup.{}".format(time.strftime("%Y%m%d%H%M%S"))
+        os.rename(siteconfpath, backup_siteconf)
+        print("Previous settings are in {}".format(backup_siteconf))
+    with open(siteconfpath, 'w') as siteconffile:
+        siteconffile.write('# This file is intended for build host-specific bitbake settings\n')
 
 def global_settings_path(args):
-    return os.path.abspath(args.global_settings) if args.global_settings else os.path.join(os.path.expanduser('~'), '.config', 'bitbake-setup', 'config')
-
-def write_global_settings(settings_path, force_replace, non_interactive=True):
-    if not os.path.exists(settings_path) or force_replace:
-
-        settings = configparser.ConfigParser()
-        settings['default'] = {
-                             'top-dir-prefix':os.path.expanduser('~'),
-                             'top-dir-name':'bitbake-builds'
-                            }
-        os.makedirs(os.path.dirname(settings_path), exist_ok=True)
-        print('Configuring global settings in\n    {}\n'.format(settings_path))
-        print('Top directory prefix (where all top level directories are created) set to\n    {}\n'.format(settings['default']['top-dir-prefix']))
-        print('Top directory name (this is added to the top directory prefix to form a top directory where builds are set up) set to\n    {}\n'.format(settings['default']['top-dir-name']))
-        if not non_interactive:
-            y_or_n = input('Write out the global settings as specified above (y/N)? ')
-            if y_or_n != 'y':
-                print("\nYou can run 'bitbake-setup install-global-settings' to edit them before setting up builds")
-                exit()
-            print()
-
-        if os.path.exists(settings_path):
-            backup_conf = settings_path + "-backup.{}".format(time.strftime("%Y%m%d%H%M%S"))
-            os.rename(settings_path, backup_conf)
-            print("Previous global settings are in {}".format(backup_conf))
-        with open(settings_path, 'w') as settingsfile:
-            settings.write(settingsfile)
-
-def load_global_settings(settings_path, non_interactive):
-    # This creates a new settings file if it does not yet exist
-    write_global_settings(settings_path, force_replace=False, non_interactive=non_interactive)
+    return os.path.abspath(args.global_settings) if args.global_settings else os.path.join(os.path.expanduser('~'), '.config', 'bitbake-setup', 'settings.conf')
 
+def load_settings(settings_path):
     settings = configparser.ConfigParser()
-    print('Loading global settings from\n    {}\n'.format(settings_path))
-    settings.read_file(open(settings_path))
+    if os.path.exists(settings_path):
+        print('Loading settings from\n    {}\n'.format(settings_path))
+        settings.read_file(open(settings_path))
     return settings
 
-def change_settings(top_dir, new_settings):
-    settings = load_settings(top_dir, non_interactive=True)
-    for section, section_settings in new_settings.items():
-        for setting, value in section_settings.items():
-            settings[section][setting] = value
-            print("Setting '{}' in section '{}' is changed to '{}'".format(setting, section, value))
-
-    settings_path = default_settings_path(top_dir)
+def change_setting(top_dir, args):
+    if vars(args)['global']:
+        settings_path = global_settings_path(args)
+    else:
+        settings_path = default_settings_path(top_dir)
+    settings = load_settings(settings_path)
+
+    if args.section and args.key and args.value:
+        if args.section not in settings.keys():
+            settings[args.section] = {}
+        settings[args.section][args.key] = args.value
+        print("Setting '{}' in section '{}' is changed to '{}'".format(args.key, args.section, args.value))
+    if args.unset:
+        section = args.unset[0]
+        setting = args.unset[1]
+        if section in settings.keys() and setting in settings[section].keys():
+            del settings[section][setting]
+            print("Setting '{} in section '{}' is removed".format(setting, section))
+
+    os.makedirs(os.path.dirname(settings_path), exist_ok=True)
     with open(settings_path, 'w') as settingsfile:
         settings.write(settingsfile)
     print("New settings written to {}".format(settings_path))
-    return settings
 
-def change_global_settings(settings_path, new_settings):
-    settings = load_global_settings(settings_path, non_interactive=True)
-    for section, section_settings in new_settings.items():
-        for setting, value in section_settings.items():
-            settings[section][setting] = value
-            print("Setting '{}' in section '{}' is changed to '{}'".format(setting, section, value))
+def list_settings(all_settings):
+    for section, section_settings in all_settings.items():
+        for key, value in section_settings.items():
+            print("{} {} {}".format(section, key, value))
 
-    with open(settings_path, 'w') as settingsfile:
-        settings.write(settingsfile)
-    print("New global settings written to {}".format(settings_path))
-    return settings
+def settings_func(top_dir, all_settings, args):
+    if args.list:
+        list_settings(all_settings)
+    else:
+        change_setting(top_dir, args)
 
 def get_build_dir_via_bbpath():
     bbpath = os.environ.get('BBPATH')
@@ -730,7 +707,7 @@ def get_build_dir_via_bbpath():
             return build_dir
     return None
 
-def get_top_dir(args, global_settings):
+def get_top_dir(args, settings):
     build_dir_via_bbpath = get_build_dir_via_bbpath()
     if build_dir_via_bbpath:
         top_dir = os.path.dirname(build_dir_via_bbpath)
@@ -738,20 +715,27 @@ def get_top_dir(args, global_settings):
             return top_dir
 
     if hasattr(args, 'build_dir'):
-        # commands without --top-dir-prefix/name arguments (status, update) still need to know where
-        # the top dir is, but it should be auto-deduced as parent of args.build_dir
         top_dir = os.path.dirname(os.path.normpath(args.build_dir))
         return top_dir
 
-    top_dir_prefix = args.top_dir_prefix if args.top_dir_prefix else global_settings['default']['top-dir-prefix']
-    top_dir_name = args.top_dir_name if args.top_dir_name else global_settings['default']['top-dir-name']
+    top_dir_prefix = settings['default']['top-dir-prefix']
+    top_dir_name = settings['default']['top-dir-name']
     return os.path.join(top_dir_prefix, top_dir_name)
 
-def main():
-    def add_top_dir_arg(parser):
-        parser.add_argument('--top-dir-prefix', help='Top level directory prefix. This is where all top level directories are created.')
-        parser.add_argument('--top-dir-name', help='Top level directory name. Together with the top directory prefix this forms a top directory where builds are set up and downloaded configurations and layers are cached for reproducibility and offline builds.')
+def merge_settings(builtin_settings, global_settings, local_settings, cmdline_settings):
+    all_settings = builtin_settings
+
+    for s in (global_settings, local_settings):
+        for section, section_settings in s.items():
+            for setting, value in section_settings.items():
+                all_settings[section][setting] = value
+
+    for (section, setting, value) in cmdline_settings:
+        all_settings[section][setting] = value
 
+    return all_settings
+
+def main():
     def add_build_dir_arg(parser):
         build_dir = get_build_dir_via_bbpath()
         if build_dir:
@@ -767,18 +751,17 @@ def main():
     parser.add_argument('-q', '--quiet', help='Print only errors', action='store_true')
     parser.add_argument('--color', choices=['auto', 'always', 'never'], default='auto', help='Colorize output (where %(metavar)s is %(choices)s)', metavar='COLOR')
     parser.add_argument('--no-network', action='store_true', help='Do not check whether configuration repositories and layer repositories have been updated; use only the local cache.')
-    parser.add_argument('--global-settings', action='store', help='Path to the global settings file where defaults for top directory prefix and name can be specified')
+    parser.add_argument('--global-settings', action='store', help='Path to the global settings file.')
+    parser.add_argument('--setting', default=[], action='append', nargs=3, help='Modify a setting (for this bitbake-setup invocation only), for example "--setting default top-dir-prefix /path/to/top/dir".')
 
     subparsers = parser.add_subparsers()
 
     parser_list = subparsers.add_parser('list', help='List available configurations')
-    add_top_dir_arg(parser_list)
     parser_list.add_argument('--with-expired', action='store_true', help='List also configurations that are no longer supported due to reaching their end-of-life dates.')
     parser_list.add_argument('--write-json', action='store', help='Write available configurations into a json file so they can be programmatically processed.')
     parser_list.set_defaults(func=list_configs)
 
     parser_init = subparsers.add_parser('init', help='Select a configuration and initialize a build from it')
-    add_top_dir_arg(parser_init)
     parser_init.add_argument('config', nargs='*', help="path/URL/id to a configuration file (use 'list' command to get available ids), followed by configuration options. Bitbake-setup will ask to choose from available choices if command line doesn't completely specify them.")
     parser_init.add_argument('--non-interactive', action='store_true', help='Do not ask to interactively choose from available options; if bitbake-setup cannot make a decision it will stop with a failure.')
     parser_init.add_argument('--source-overrides', action='store', help='Override sources information (repositories/revisions) with values from a local json file.')
@@ -799,25 +782,14 @@ def main():
     parser_install_buildtools.add_argument('--force', action='store_true', help='Force a reinstall of buildtools over the previous installation.')
     parser_install_buildtools.set_defaults(func=install_buildtools)
 
-    parser_install_settings = subparsers.add_parser('install-settings', help='Write a settings file with default values into the top level directory (contains the location of build configuration registry, downloads directory and other settings specific to a top directory)')
-    add_top_dir_arg(parser_install_settings)
-    parser_install_settings.set_defaults(func=write_settings)
-
-    parser_install_global_settings = subparsers.add_parser('install-global-settings', help='Write a global settings file with default values (contains the default prefix and name of the top directory)')
-    parser_install_global_settings.set_defaults(func=write_global_settings)
-
-    parser_change_setting = subparsers.add_parser('change-setting', help='Change a setting in the settings file')
-    add_top_dir_arg(parser_change_setting)
-    parser_change_setting.add_argument('section', help="Section in a settings file, typically 'default'")
-    parser_change_setting.add_argument('key', help="Name of the setting")
-    parser_change_setting.add_argument('value', help="Value of the setting")
-    parser_change_setting.set_defaults(func=change_settings)
-
-    parser_change_global_setting = subparsers.add_parser('change-global-setting', help='Change a setting in the global settings file')
-    parser_change_global_setting.add_argument('section', help="Section in a global settings file, typically 'default'")
-    parser_change_global_setting.add_argument('key', help="Name of the setting")
-    parser_change_global_setting.add_argument('value', help="Value of the setting")
-    parser_change_global_setting.set_defaults(func=change_global_settings)
+    parser_settings = subparsers.add_parser('settings', help='List current settings, or set or unset a setting in a settings file (e.g. the default prefix and name of the top directory, the location of build configuration registry, downloads directory and other settings specific to a top directory)')
+    parser_settings.add_argument('section', nargs='?', help="Section in a settings file, typically 'default'")
+    parser_settings.add_argument('key', nargs='?', help="Name of the setting")
+    parser_settings.add_argument('value', nargs='?', help="Value of the setting")
+    parser_settings.add_argument('--global', action='store_true', help="Modify the setting in a global settings file, rather than one specific to a top directory")
+    parser_settings.add_argument('--unset', nargs=2, help="Unset a setting, e.g. 'bitbake-setup setting --unset default registry' would revert to the registry setting in a global settings file")
+    parser_settings.add_argument('-l' ,'--list', action='store_true', help="List all settings with their values")
+    parser_settings.set_defaults(func=settings_func)
 
     args = parser.parse_args()
 
@@ -834,13 +806,6 @@ def main():
                          level=logger.getEffectiveLevel())
 
     if 'func' in args:
-        if args.func == write_global_settings:
-            write_global_settings(global_settings_path(args), force_replace=True)
-            return
-        elif args.func == change_global_settings:
-            change_global_settings(global_settings_path(args), {args.section:{args.key:args.value}})
-            return
-
         if hasattr(args, 'build_dir'):
             if not os.path.exists(os.path.join(args.build_dir,'build', 'init-build-env')):
                 print("Not a valid build directory: build/init-build-env does not exist in {}".format(args.build_dir))
@@ -849,19 +814,31 @@ def main():
         if not hasattr(args, 'non_interactive'):
             args.non_interactive = True
 
-        global_settings = load_global_settings(global_settings_path(args), args.non_interactive)
-        args.top_dir = get_top_dir(args, global_settings)
+        builtin_settings = {}
+        builtin_settings['default'] = {
+                         'top-dir-prefix':os.path.expanduser('~'),
+                         'top-dir-name':'bitbake-builds',
+                         'registry':default_registry,
+                         }
 
-        print('Bitbake-setup is using {} as top directory (can be changed with --top-dir-prefix/name arguments or by setting them in {}).\n'.format(args.top_dir, global_settings_path(args)))
-        if args.func == write_settings:
-            write_settings(args.top_dir, force_replace=True)
-        elif args.func == change_settings:
-            change_settings(args.top_dir, {args.section:{args.key:args.value}})
-        else:
-            settings = load_settings(args.top_dir, args.non_interactive)
-            d = init_bb_cache(settings, args)
-            args.func(settings, args, d)
-            save_bb_cache()
+        global_settings = load_settings(global_settings_path(args))
+        top_dir = get_top_dir(args, merge_settings(builtin_settings, global_settings, {}, args.setting))
+
+        # This cannot be set with the rest of the builtin settings as top_dir needs to be determined first
+        builtin_settings['default']['dl-dir'] = os.path.join(top_dir, '.bitbake-setup-downloads')
+
+        topdir_settings = load_settings(default_settings_path(top_dir))
+        all_settings = merge_settings(builtin_settings, global_settings, topdir_settings, args.setting)
+
+        if args.func == settings_func:
+            settings_func(top_dir, all_settings, args)
+            return
+
+        print('Bitbake-setup is using {} as top directory ("bitbake-setup setting --help" shows how to change it).\n'.format(top_dir, global_settings_path(args)))
+
+        d = init_bb_cache(top_dir, all_settings, args)
+        args.func(top_dir, all_settings, args, d)
+        save_bb_cache()
     else:
         from argparse import Namespace
         parser.print_help()
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 96d70080d3..63d4edd892 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1610,6 +1610,7 @@ class RunQueue:
 
         if self.state == RunQueueState.SCENE_INIT:
             self.start_worker(self.rqexe)
+            self.rqdata.init_progress_reporter.finish()
 
             # If we don't have any setscene functions, skip execution
             if not self.rqdata.runq_setscene_tids:
@@ -1947,10 +1948,6 @@ class RunQueueExecute:
         self.sqdata = SQData()
         build_scenequeue_data(self.sqdata, self.rqdata, self)
 
-        # Finish the "Initialising tasks" progress bar before
-        # update_scenequeue_data() creates another one.
-        self.rqdata.init_progress_reporter.finish()
-
         update_scenequeue_data(self.sqdata.sq_revdeps, self.sqdata, self.rqdata, self.rq, self.cooker, self.stampcache, self, summary=True)
 
         # Compute a list of 'stale' sstate tasks where the current hash does not match the one
diff --git a/bitbake/lib/bb/tests/setup.py b/bitbake/lib/bb/tests/setup.py
index 747a9b733f..b238926b29 100644
--- a/bitbake/lib/bb/tests/setup.py
+++ b/bitbake/lib/bb/tests/setup.py
@@ -120,6 +120,22 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
                 "oe-fragments": ["test-fragment-2"]
             },
             {
+                "name": "gizmo-env-passthrough",
+                "description": "Gizmo build configuration with environment-passthrough",
+                "bb-layers": ["layerC","layerD/meta-layer"],
+                "oe-fragments": ["test-fragment-1"],
+                "bb-env-passthrough-additions": [
+                    "BUILD_ID",
+                    "BUILD_DATE",
+                    "BUILD_SERVER"
+                ]
+            },
+            {
+                "name": "gizmo-no-fragment",
+                "description": "Gizmo no-fragment template-only build configuration",
+                "oe-template": "test-configuration-gizmo"
+            },
+            {
                 "name": "gadget-notemplate",
                 "description": "Gadget notemplate build configuration",
                 "bb-layers": ["layerA","layerB/meta-layer"],
@@ -189,8 +205,18 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
                     else:
                         self.assertIn(os.path.join(buildpath, "layers", l), bblayers)
 
-        for f in bitbake_config["oe-fragments"]:
-            self.assertTrue(os.path.exists(os.path.join(bb_conf_path, f)))
+        if 'oe-fragment' in bitbake_config.keys():
+            for f in bitbake_config["oe-fragments"]:
+                self.assertTrue(os.path.exists(os.path.join(bb_conf_path, f)))
+
+        if 'bb-environment-passthrough' in bitbake_config.keys():
+            with open(os.path.join(bb_build_path, 'init-build-env'), 'r') as f:
+                init_build_env = f.read()
+            self.assertTrue('BB_ENV_PASSTHROUGH_ADDITIONS' in init_build_env)
+            self.assertTrue('BUILD_ID' in init_build_env)
+            self.assertTrue('BUILD_DATE' in init_build_env)
+            self.assertTrue('BUILD_SERVER' in init_build_env)
+            # a more throrough test could be to initialize a bitbake build-env, export FOO to the shell environment, set the env-passthrough on it and finally check against 'bitbake-getvar FOO'
 
 
     def test_setup(self):
@@ -206,22 +232,29 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
         self.runbbsetup("--help")
 
         # set up global location for top-dir-prefix
-        out = self.runbbsetup("install-global-settings")
+        out = self.runbbsetup("settings --global default top-dir-prefix {}".format(self.tempdir))
         settings_path = "{}/global-config".format(self.tempdir)
         self.assertIn(settings_path, out[0])
-        out = self.runbbsetup("change-global-setting default top-dir-prefix {}".format(self.tempdir))
         self.assertIn("Setting 'top-dir-prefix' in section 'default' is changed to", out[0])
-        self.assertIn("New global settings written to".format(settings_path), out[0])
+        self.assertIn("New settings written to".format(settings_path), out[0])
+        out = self.runbbsetup("settings --global default dl-dir {}".format(os.path.join(self.tempdir, 'downloads')))
+        self.assertIn("Setting 'dl-dir' in section 'default' is changed to", out[0])
+        self.assertIn("New settings written to".format(settings_path), out[0])
 
         # check that writing settings works and then adjust them to point to
         # test registry repo
-        out = self.runbbsetup("install-settings")
-        settings_path = "{}/bitbake-builds/bitbake-setup.conf".format(self.tempdir)
+        out = self.runbbsetup("settings default registry 'git://{};protocol=file;branch=master;rev=master'".format(self.registrypath))
+        settings_path = "{}/bitbake-builds/settings.conf".format(self.tempdir)
         self.assertIn(settings_path, out[0])
-        out = self.runbbsetup("change-setting default registry 'git://{};protocol=file;branch=master;rev=master'".format(self.registrypath))
         self.assertIn("Setting 'registry' in section 'default' is changed to", out[0])
         self.assertIn("New settings written to".format(settings_path), out[0])
 
+        # check that listing settings works
+        out = self.runbbsetup("settings --list")
+        self.assertIn("default top-dir-prefix {}".format(self.tempdir), out[0])
+        self.assertIn("default dl-dir {}".format(os.path.join(self.tempdir, 'downloads')), out[0])
+        self.assertIn("default registry {}".format('git://{};protocol=file;branch=master;rev=master'.format(self.registrypath)), out[0])
+
         # check that 'list' produces correct output with no configs, one config and two configs
         out = self.runbbsetup("list")
         self.assertNotIn("test-config-1", out[0])
@@ -247,8 +280,18 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
         self.add_file_to_testrepo('test-file', test_file_content)
 
         # test-config-1 is tested as a registry config, test-config-2 as a local file
-        test_configurations = {'test-config-1': {'cmdline': 'test-config-1', 'buildconfigs':('gadget','gizmo','gadget-notemplate','gizmo-notemplate')},
-                               'test-config-2': {'cmdline': os.path.join(self.registrypath,'config-2/test-config-2.conf.json'), 'buildconfigs': ('gadget','gizmo','gadget-notemplate','gizmo-notemplate', 'gizmo-notemplate-with-thisdir') } }
+        test_configurations = {'test-config-1': {'cmdline': 'test-config-1',
+                                                 'buildconfigs':('gadget','gizmo',
+                                                                 'gizmo-env-passthrough',
+                                                                 'gizmo-no-fragment',
+                                                                 'gadget-notemplate','gizmo-notemplate')},
+                               'test-config-2': {'cmdline': os.path.join(self.registrypath,'config-2/test-config-2.conf.json'),
+                                                 'buildconfigs': ('gadget','gizmo',
+                                                                  'gizmo-env-passthrough',
+                                                                  'gizmo-no-fragment',
+                                                                  'gadget-notemplate','gizmo-notemplate',
+                                                                  'gizmo-notemplate-with-thisdir')}
+                               }
         for cf, v in test_configurations.items():
             for c in v['buildconfigs']:
                 out = self.runbbsetup("init --non-interactive {} {}".format(v['cmdline'], c))
@@ -272,13 +315,16 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
         prev_test_file_content = test_file_content
         test_file_content = 'modified\n'
         self.add_file_to_testrepo('test-file', test_file_content)
-        for c in ('gadget','gizmo','gadget-notemplate','gizmo-notemplate'):
+        for c in ('gadget', 'gizmo',
+                  'gizmo-env-passthrough',
+                  'gizmo-no-fragment',
+                  'gadget-notemplate', 'gizmo-notemplate'):
             buildpath = os.path.join(self.tempdir, 'bitbake-builds', 'test-config-1-{}'.format(c))
             os.environ['BBPATH'] = os.path.join(buildpath, 'build')
             out = self.runbbsetup("status")
             self.assertIn("Layer repository file://{} checked out into {}/layers/test-repo updated revision master from".format(self.testrepopath, buildpath), out[0])
             out = self.runbbsetup("update")
-            if c in ('gadget','gizmo'):
+            if c in ('gadget', 'gizmo'):
                 self.assertIn("Existing bitbake configuration directory renamed to {}/build/conf-backup.".format(buildpath), out[0])
                 self.assertIn('-{}+{}'.format(prev_test_file_content, test_file_content), out[0])
             with open(os.path.join(buildpath, 'config', "config-upstream.json")) as f:
@@ -294,14 +340,17 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
         self.git('checkout -b {}'.format(branch), cwd=self.testrepopath)
         self.add_file_to_testrepo('test-file', test_file_content)
         json_1 = self.add_json_config_to_registry('test-config-1.conf.json', branch, branch)
-        for c in ('gadget','gizmo','gadget-notemplate','gizmo-notemplate'):
+        for c in ('gadget', 'gizmo',
+                  'gizmo-env-passthrough',
+                  'gizmo-no-fragment',
+                  'gadget-notemplate', 'gizmo-notemplate'):
             buildpath = os.path.join(self.tempdir, 'bitbake-builds', 'test-config-1-{}'.format(c))
             os.environ['BBPATH'] = os.path.join(buildpath, 'build')
             out = self.runbbsetup("status")
             self.assertIn("Configuration in {} has changed:".format(buildpath), out[0])
             self.assertIn('-                    "rev": "master"\n+                    "rev": "another-branch"', out[0])
             out = self.runbbsetup("update")
-            if c in ('gadget','gizmo'):
+            if c in ('gadget', 'gizmo'):
                 self.assertIn("Existing bitbake configuration directory renamed to {}/build/conf-backup.".format(buildpath), out[0])
                 self.assertIn('-{}+{}'.format(prev_test_file_content, test_file_content), out[0])
             with open(os.path.join(buildpath, 'config', "config-upstream.json")) as f:
diff --git a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
index 781763d1f1..961d4ea31d 100644
--- a/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
+++ b/meta-yocto-bsp/lib/oeqa/selftest/cases/systemd_boot.py
@@ -18,7 +18,7 @@ class Systemdboot(OESelftestTestCase):
 
         # Set EFI_PROVIDER = "systemdboot" and MACHINE = "genericx86-64" in conf/local.conf
         features = 'EFI_PROVIDER = "systemd-boot"\n'
-        features += 'MACHINE = "genericx86-64"\n'
+        features += 'MACHINE:forcevariable = "genericx86-64"\n'
         features += 'IMAGE_FSTYPES += "wic"\n'
         features += 'COMPATIBLE_MACHINE:pn-ssh-pregen-hostkeys:genericx86-64 = "genericx86-64"\n'
         self.append_config(features)
diff --git a/meta/classes-recipe/core-image.bbclass b/meta/classes-recipe/core-image.bbclass
index 4072e420c5..309a7c577b 100644
--- a/meta/classes-recipe/core-image.bbclass
+++ b/meta/classes-recipe/core-image.bbclass
@@ -33,6 +33,7 @@
 #                         LICENSE_CREATE_PACKAGE="1" to be set when building packages too
 # - doc-pkgs            - documentation packages for all installed packages in the rootfs
 # - bash-completion-pkgs - bash-completion packages for recipes using bash-completion bbclass
+# - zsh-completion-pkgs - zsh-completion packages
 # - ptest-pkgs          - ptest packages for all ptest-enabled recipes
 # - read-only-rootfs    - tweaks an image to support read-only rootfs
 # - stateless-rootfs    - systemctl-native not run, image populated by systemd at runtime
diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass
index 0c2fd26e6f..8e671cf28f 100644
--- a/meta/classes-recipe/populate_sdk_base.bbclass
+++ b/meta/classes-recipe/populate_sdk_base.bbclass
@@ -24,6 +24,7 @@ COMPLEMENTARY_GLOB[dbg-pkgs] = '*-dbg'
 COMPLEMENTARY_GLOB[src-pkgs] = '*-src'
 COMPLEMENTARY_GLOB[ptest-pkgs] = '*-ptest ${MLPREFIX}ptest-runner'
 COMPLEMENTARY_GLOB[bash-completion-pkgs] = '*-bash-completion'
+COMPLEMENTARY_GLOB[zsh-completion-pkgs] = '*-zsh-completion'
 
 def complementary_globs(featurevar, d):
     all_globs = d.getVarFlags('COMPLEMENTARY_GLOB')
diff --git a/meta/classes-recipe/uboot-config.bbclass b/meta/classes-recipe/uboot-config.bbclass
index bc20913f73..eb82dd3583 100644
--- a/meta/classes-recipe/uboot-config.bbclass
+++ b/meta/classes-recipe/uboot-config.bbclass
@@ -35,6 +35,7 @@ UBOOT_BINARYNAME ?= "${@os.path.splitext(d.getVar("UBOOT_BINARY"))[0]}"
 UBOOT_IMAGE ?= "${UBOOT_BINARYNAME}-${MACHINE}-${UBOOT_VERSION}.${UBOOT_SUFFIX}"
 UBOOT_SYMLINK ?= "${UBOOT_BINARYNAME}-${MACHINE}.${UBOOT_SUFFIX}"
 UBOOT_MAKE_TARGET ?= "all"
+UBOOT_MAKE_OPTS ?= ""
 
 # Output the ELF generated. Some platforms can use the ELF file and directly
 # load it (JTAG booting, QEMU) additionally the ELF can be used for debugging
@@ -103,6 +104,7 @@ python () {
     ubootconfigflags = d.getVarFlags('UBOOT_CONFIG')
     ubootbinary = d.getVar('UBOOT_BINARY')
     ubootbinaries = d.getVar('UBOOT_BINARIES')
+    ubootconfigmakeopts = d.getVar('UBOOT_CONFIG_MAKE_OPTS')
     # The "doc" varflag is special, we don't want to see it here
     ubootconfigflags.pop('doc', None)
     ubootconfig = (d.getVar('UBOOT_CONFIG') or "").split()
@@ -120,6 +122,9 @@ python () {
     if ubootconfigflags and ubootbinaries:
         raise bb.parse.SkipRecipe("You cannot use UBOOT_BINARIES as it is internal to uboot_config.bbclass.")
 
+    if ubootconfigflags and ubootconfigmakeopts:
+        raise bb.parse.SkipRecipe("You cannot use UBOOT_CONFIG_MAKE_OPTS as it is internal to uboot_config.bbclass.")
+
     if len(ubootconfig) > 0:
         for config in ubootconfig:
             found = False
@@ -127,8 +132,8 @@ python () {
                 if config == f: 
                     found = True
                     items = v.split(',')
-                    if items[0] and len(items) > 3:
-                        raise bb.parse.SkipRecipe('Only config,images,binary can be specified!')
+                    if items[0] and len(items) > 4:
+                        raise bb.parse.SkipRecipe('Only config,images,binary,make_opts can be specified!')
                     d.appendVar('UBOOT_MACHINE', ' ' + items[0])
                     # IMAGE_FSTYPES appending
                     if len(items) > 1 and items[1]:
@@ -140,6 +145,12 @@ python () {
                     else:
                         bb.debug(1, "Appending '%s' to UBOOT_BINARIES." % ubootbinary)
                         d.appendVar('UBOOT_BINARIES', ' ' + ubootbinary)
+                    if len(items) > 3 and items[3]:
+                        bb.debug(1, "Appending '%s' to UBOOT_CONFIG_MAKE_OPTS." % items[3])
+                        d.appendVar('UBOOT_CONFIG_MAKE_OPTS', items[3] + " ? ")
+                    else:
+                        bb.debug(1, "Appending '%s' to UBOOT_CONFIG_MAKE_OPTS." % "")
+                        d.appendVar('UBOOT_CONFIG_MAKE_OPTS', " ? ")
                     break
 
             if not found:
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 8d1ea5491d..5406e542db 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -775,9 +775,9 @@ export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
 export PKG_CONFIG_SYSTEM_LIBRARY_PATH = "${base_libdir}:${libdir}"
 export PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}"
 
-# Don't allow git to chdir up past WORKDIR so that it doesn't detect the OE
-# repository when building a recipe
-export GIT_CEILING_DIRECTORIES = "${WORKDIR}"
+# Don't allow git to chdir up past WORKDIR or TMPDIR so that it doesn't detect the OE
+# repository when building a recipe.
+export GIT_CEILING_DIRECTORIES = "${WORKDIR}:${TMPDIR}"
 
 ###
 ### Config file processing
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 102789ce73..54bc3d7666 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -1073,7 +1073,7 @@ def get_recipe_upstream_version(rd):
             upversion = None
             revision = None
             try:
-                revision = ud.method.latest_revision(ud, rd, 'default')
+                revision = ud.method.latest_revision(ud, rd, ud.name)
                 upversion = pv
                 if revision != ud.revision:
                     upversion = upversion + "-new-commits-available"
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index 8b5c450a05..0ac3ae4388 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -55,7 +55,7 @@ class OESSHTarget(OETarget):
     def stop(self, **kwargs):
         pass
 
-    def _run(self, command, timeout=None, ignore_status=True, raw=False):
+    def _run(self, command, timeout=None, ignore_status=True, raw=False, ignore_ssh_fails=False):
         """
             Runs command in target using SSHProcess.
         """
@@ -66,13 +66,17 @@ class OESSHTarget(OETarget):
         self.logger.debug("[Command returned '%d' after %.2f seconds]"
                  "" % (status, time.time() - starttime))
 
-        if status and not ignore_status:
+        if status == 255 and not ignore_ssh_fails:
+            raise AssertionError("ssh exited with status '255' for command "
+                                 "'%s': this is likely an SSH failure\n%s"
+                                 % (command, output))
+        elif status and not ignore_status:
             raise AssertionError("Command '%s' returned non-zero exit "
                                  "status %d:\n%s" % (command, status, output))
 
         return (status, output)
 
-    def run(self, command, timeout=None, ignore_status=True, raw=False):
+    def run(self, command, timeout=None, ignore_status=True, raw=False, ignore_ssh_fails=False):
         """
             Runs command in target.
 
@@ -91,7 +95,7 @@ class OESSHTarget(OETarget):
         else:
             processTimeout = self.timeout
 
-        status, output = self._run(sshCmd, processTimeout, ignore_status, raw)
+        status, output = self._run(sshCmd, processTimeout, ignore_status, raw, ignore_ssh_fails)
         if len(output) > (64 * 1024):
             self.logger.debug('Command: %s\nStatus: %d Output length:  %s\n' % (command, status, len(output)))
         else:
diff --git a/meta/lib/oeqa/runtime/cases/logrotate.py b/meta/lib/oeqa/runtime/cases/logrotate.py
index 6ad980cb6a..7cb43d98c5 100644
--- a/meta/lib/oeqa/runtime/cases/logrotate.py
+++ b/meta/lib/oeqa/runtime/cases/logrotate.py
@@ -15,12 +15,13 @@ class LogrotateTest(OERuntimeTestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.tc.target.run('cp /etc/logrotate.d/wtmp $HOME/wtmp.oeqabak')
+        cls.tc.target.run('cp /etc/logrotate.d/wtmp $HOME/wtmp.oeqabak',
+                          ignore_ssh_fails=True)
 
     @classmethod
     def tearDownClass(cls):
-        cls.tc.target.run('mv -f $HOME/wtmp.oeqabak /etc/logrotate.d/wtmp && rm -rf /var/log//logrotate_dir')
-        cls.tc.target.run('rm -rf /var/log/logrotate_testfile && rm -rf /etc/logrotate.d/logrotate_testfile')
+        cls.tc.target.run('mv -f $HOME/wtmp.oeqabak /etc/logrotate.d/wtmp && rm -rf /var/log//logrotate_dir', ignore_ssh_fails=True)
+        cls.tc.target.run('rm -rf /var/log/logrotate_testfile && rm -rf /etc/logrotate.d/logrotate_testfile', ignore_ssh_fails=True)
 
     @OETestDepends(['ssh.SSHTest.test_ssh'])
     @OEHasPackage(['logrotate'])
diff --git a/meta/lib/oeqa/runtime/cases/ssh.py b/meta/lib/oeqa/runtime/cases/ssh.py
index b632a29a01..3e9503277e 100644
--- a/meta/lib/oeqa/runtime/cases/ssh.py
+++ b/meta/lib/oeqa/runtime/cases/ssh.py
@@ -17,7 +17,7 @@ class SSHTest(OERuntimeTestCase):
     @OEHasPackage(['dropbear', 'openssh-sshd'])
     def test_ssh(self):
         for i in range(5):
-          status, output = self.target.run("uname -a", timeout=30)
+          status, output = self.target.run("uname -a", timeout=30, ignore_ssh_fails=True)
           if status == 0:
               break
           elif status == 255 or status == -signal.SIGTERM:
diff --git a/meta/lib/oeqa/runtime/cases/weston.py b/meta/lib/oeqa/runtime/cases/weston.py
index ee4d336482..e2cecffe83 100644
--- a/meta/lib/oeqa/runtime/cases/weston.py
+++ b/meta/lib/oeqa/runtime/cases/weston.py
@@ -16,7 +16,7 @@ class WestonTest(OERuntimeTestCase):
 
     @classmethod
     def tearDownClass(cls):
-        cls.tc.target.run('rm %s' % cls.weston_log_file)
+        cls.tc.target.run('rm %s' % cls.weston_log_file, ignore_ssh_fails=True)
 
     @OETestDepends(['ssh.SSHTest.test_ssh'])
     @OEHasPackage(['weston'])
diff --git a/meta/lib/oeqa/sdk/cases/autotools.py b/meta/lib/oeqa/sdk/cases/autotools.py
index 3f51854e3d..ecafafa7d6 100644
--- a/meta/lib/oeqa/sdk/cases/autotools.py
+++ b/meta/lib/oeqa/sdk/cases/autotools.py
@@ -27,7 +27,7 @@ class AutotoolsTest(OESDKTestCase):
         pmv = parallel_make_value((self.td.get('PARALLEL_MAKE') or '').split())
 
         with tempfile.TemporaryDirectory(prefix="cpio-", dir=self.tc.sdk_dir) as testdir:
-            tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.15.tar.gz")
+            tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftpmirror.gnu.org/gnu/cpio/cpio-2.15.tar.gz")
 
             opts = {}
             opts["source"] = os.path.join(testdir, "cpio-2.15")
diff --git a/meta/lib/oeqa/selftest/cases/bblayers.py b/meta/lib/oeqa/selftest/cases/bblayers.py
index 08bc1d1e44..8026e7ed4a 100644
--- a/meta/lib/oeqa/selftest/cases/bblayers.py
+++ b/meta/lib/oeqa/selftest/cases/bblayers.py
@@ -157,7 +157,9 @@ class BitbakeLayers(OESelftestTestCase):
         with open(jsonfile) as f:
             data = json.load(f)
         for s in data['sources']:
-            if s == 'meta-yocto':
+            if s == 'poky':
+                data['sources'][s]['git-remote']['rev'] = '5200799866b92259e855051112520006e1aaaac0'
+            elif s == 'meta-yocto':
                 data['sources'][s]['git-remote']['rev'] = '913bd8ba4dd1d5d2a38261bde985b64a36e36281'
             else:
                 data['sources'][s]['git-remote']['rev'] = '744a2277844ec9a384a9ca7dae2a634d5a0d3590'
diff --git a/meta/lib/oeqa/selftest/cases/meta_ide.py b/meta/lib/oeqa/selftest/cases/meta_ide.py
index 1a11473797..f105302d8b 100644
--- a/meta/lib/oeqa/selftest/cases/meta_ide.py
+++ b/meta/lib/oeqa/selftest/cases/meta_ide.py
@@ -44,7 +44,7 @@ class MetaIDE(OESelftestTestCase):
     def test_meta_ide_can_build_cpio_project(self):
         dl_dir = self.td.get('DL_DIR', None)
         self.project = SDKBuildProject(self.tmpdir_metaideQA + "/cpio/", self.environment_script_path,
-                        "https://ftp.gnu.org/gnu/cpio/cpio-2.15.tar.gz",
+                        "https://ftpmirror.gnu.org/gnu/cpio/cpio-2.15.tar.gz",
                         self.tmpdir_metaideQA, self.td['DATETIME'], dl_dir=dl_dir)
         self.project.download_archive()
         self.assertEqual(self.project.run_configure('CFLAGS="-std=gnu17 -Dbool=int -Dtrue=1 -Dfalse=0 -Wno-error=implicit-function-declaration" $CONFIGURE_FLAGS'), 0,
diff --git a/meta/lib/oeqa/utils/postactions.py b/meta/lib/oeqa/utils/postactions.py
index c69481db6c..7b967edaad 100644
--- a/meta/lib/oeqa/utils/postactions.py
+++ b/meta/lib/oeqa/utils/postactions.py
@@ -22,7 +22,7 @@ from oeqa.utils import get_artefact_dir
 def get_target_disk_usage(d, tc, artifacts_list, outputdir):
     output_file = os.path.join(outputdir, "target_disk_usage.txt")
     try:
-        (status, output) = tc.target.run('df -h')
+        (status, output) = tc.target.run('df -h', ignore_ssh_fails=True)
         with open(output_file, 'w') as f:
             f.write(output)
             f.write("\n")
@@ -49,7 +49,7 @@ def get_artifacts_list(target, raw_list):
     for raw_path in raw_list.split():
         cmd = f"for p in {raw_path}; do if [ -e $p ]; then echo $p; fi; done"
         try:
-            status, output = target.run(cmd)
+            status, output = target.run(cmd, ignore_ssh_fails=True)
             if status != 0 or not output:
                 raise Exception()
             result += output.split()
diff --git a/meta/lib/patchtest/repo.py b/meta/lib/patchtest/repo.py
index 2cdd6736e4..6a7d7d2d3b 100644
--- a/meta/lib/patchtest/repo.py
+++ b/meta/lib/patchtest/repo.py
@@ -21,7 +21,12 @@ class PatchTestRepo(object):
         self.repodir = repodir
         self.repo = git.Repo.init(repodir)
         self.patch = mbox.PatchSeries(patch)
-        self.current_branch = self.repo.active_branch.name
+
+        if self.repo.head.is_detached:
+            self.current_commit = self.repo.head.commit.hexsha
+            self.current_branch = None
+        else:
+            self.current_branch = self.repo.active_branch.name
 
         # targeted branch defined on the patch may be invalid, so make sure there
         # is a corresponding remote branch
@@ -80,6 +85,6 @@ class PatchTestRepo(object):
             self._patchmerged = True
 
     def clean(self):
-        self.repo.git.execute(['git', 'checkout', self.current_branch])
+        self.repo.git.execute(['git', 'checkout', self.current_branch if self.current_branch else self.current_commit])
         self.repo.git.execute(['git', 'branch', '-D', self._workingbranch])
         self._patchmerged = False
diff --git a/meta/recipes-bsp/u-boot/files/0001-Makefile-add-dependency-from-lib-to-arch-ARCH-lib.patch b/meta/recipes-bsp/u-boot/files/0001-Makefile-add-dependency-from-lib-to-arch-ARCH-lib.patch
deleted file mode 100644
index 06fdaf5b0a..0000000000
--- a/meta/recipes-bsp/u-boot/files/0001-Makefile-add-dependency-from-lib-to-arch-ARCH-lib.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From d0075e2d730a4fa48aa763a669e5edbc02c33a22 Mon Sep 17 00:00:00 2001
-From: Mikko Rapeli <mikko.rapeli@linaro.org>
-Date: Thu, 31 Jul 2025 14:52:48 +0300
-Subject: [PATCH] Makefile: add dependency from lib to arch/$(ARCH)/lib
-
-Top level Makefile starts separate "make" processes for each each
-subdirectory. lib/efi_loader apps now depend on lib.a from
-arch/$(ARCH)/lib if CONFIG_USE_PRIVATE_LIBGCC is enabled which creates
-a race conditions since dependency from lib/efi_loader EFI apps to
-arch/$(ARCH)/lib/lib.a is not explicit:
-
-arm-poky-linux-gnueabi-ld.bfd: cannot find arch/arm/lib/lib.a: No such file or directory
-make[3]: *** [scripts/Makefile.lib:512: lib/efi_loader/testapp_efi.so] Error 1
-
-This error was seen on yocto/OE-core CI builds after u-boot 2025.07 update:
-
-https://lists.openembedded.org/g/openembedded-core/message/220004
-
-https://autobuilder.yoctoproject.org/valkyrie/api/v2/logs/2914600/raw_inline
-
-    |    rm -f lib/efi_loader/built-in.o; arm-poky-linux-gnueabi-ar cDPrsT lib/efi_loader/built-in.o lib/efi_loader/efi_bootmgr.o lib/efi_loader/efi_bootbin.o lib/efi_loader
-/efi_boottime.o lib/efi_loader/efi_helper.o lib/efi_loader/efi_console.o lib/efi_loader/efi_device_path.o lib/efi_loader/efi_device_path_to_text.o lib/efi_loader/efi_device_
-path_utilities.o lib/efi_loader/efi_dt_fixup.o lib/efi_loader/efi_fdt.o lib/efi_loader/efi_file.o lib/efi_loader/efi_hii.o lib/efi_loader/efi_hii_config.o lib/efi_loader/efi
-_image_loader.o lib/efi_loader/efi_load_options.o lib/efi_loader/efi_memory.o lib/efi_loader/efi_root_node.o lib/efi_loader/efi_runtime.o lib/efi_loader/efi_setup.o lib/efi_
-loader/efi_string.o lib/efi_loader/efi_unicode_collation.o lib/efi_loader/efi_var_common.o lib/efi_loader/efi_var_mem.o lib/efi_loader/efi_variable.o lib/efi_loader/efi_var_
-file.o lib/efi_loader/efi_watchdog.o lib/efi_loader/efi_disk.o lib/efi_loader/efi_net.o lib/efi_loader/efi_smbios.o lib/efi_loader/efi_load_initrd.o lib/efi_loader/efi_confo
-rmance.o
-    |   arm-poky-linux-gnueabi-ld.bfd -nostdlib -zexecstack -znocombreloc -znorelro --no-warn-rwx-segments -L /srv/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-
-3119200/tmp/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/2025.07/sources/u-boot-2025.07 -T arch/arm/lib/elf_arm_efi.lds -shared -Bsymbolic -s lib/efi_loader/helloworld.o
-lib/efi_loader/efi_crt0.o lib/efi_loader/efi_reloc.o lib/efi_loader/efi_freestanding.o arch/arm/lib/lib.a -o lib/efi_loader/helloworld_efi.so
-    | arm-poky-linux-gnueabi-ld.bfd: cannot find arch/arm/lib/lib.a: No such file or directory
-    | make[3]: *** [scripts/Makefile.lib:512: lib/efi_loader/helloworld_efi.so] Error 1
-
-The different "make" processes share common scripts/Makefile.build
-and scripts/Makefile.libs but since they are separate processes
-the Makefile rules can't add a dependency from lib/uefi_loader targets
-to arch/$(ARCH)/lib/lib.a. Or the file level dependency can be added but
-then "make" produces a too sparse error message which does not mention
-that one of the dependencies like arch/$(ARCH)/lib/lib.a was not found:
-
-make[3]: *** No rule to make target 'lib/efi_loader/helloworld.efi', needed by '__build'.  Stop.
-
-Fix this dependency problem by building arch/$(ARCH)/lib before lib
-if CONFIG_USE_PRIVATE_LIBGCC was enabled.
-
-To reproduce the race condition more reliably, add a "sleep 10" delay
-before linker command cmd_link_l_target with 2025.07
-or to $(lib-target): target in scripts/Makefile.build with master branch
-after Kbuild update.
-
-Fixes: 43d43241d1c9 ("scripts/Makefile.lib: add PLATFORM_LIBGCC to efi linking")
-
-Cc: Adriano Cordova <adrianox@gmail.com>
-Cc: Fabio Estevam <festevam@gmail.com>
-Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
-Reviewed-by: Fabio Estevam <festevam@gmail.com>
----
- Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-Upstream-Status: Backport
-
-diff --git a/Makefile b/Makefile
-index c31bf7ecea97..b03f87a93fb9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2131,6 +2131,11 @@ $(filter-out tools, $(u-boot-dirs)): tools
- # is "yes"), so compile examples after U-Boot is compiled.
- examples: $(filter-out examples, $(u-boot-dirs))
- 
-+ifeq ($(CONFIG_USE_PRIVATE_LIBGCC),y)
-+# lib/efi_loader apps depend on arch/$(ARCH)/lib for lib.a
-+lib: $(filter arch/$(ARCH)/lib, $(u-boot-dirs))
-+endif
-+
- # The setlocalversion script comes from linux and expects a
- # KERNELVERSION variable in the environment for figuring out which
- # annotated tags are relevant. Pass UBOOTVERSION.
--- 
-2.43.0
-
diff --git a/meta/recipes-bsp/u-boot/files/0001-nxp-Prepare-macros-for-KVM-changes.patch b/meta/recipes-bsp/u-boot/files/0001-nxp-Prepare-macros-for-KVM-changes.patch
deleted file mode 100644
index fa34c8033e..0000000000
--- a/meta/recipes-bsp/u-boot/files/0001-nxp-Prepare-macros-for-KVM-changes.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 9be804cbfde1df715d79247b27de4b388c714cde Mon Sep 17 00:00:00 2001
-From: Ilias Apalodimas <ilias.apalodimas@linaro.org>
-Date: Wed, 18 Jun 2025 09:58:12 +0300
-Subject: [PATCH 1/3] nxp: Prepare macros for KVM changes
-
-A following patch is replacing our IO accessors with
-do { ... } while(0) ones in order to make them usable with KVM.
-
-That leads to an error eventually looking like this:
-arch/arm/include/asm/io.h:62:9: error: expected expression before 'do'
-   62 |         do {                                            \
-      |         ^~
-arch/arm/include/asm/io.h:211:41: note: in expansion of macro '__raw_writel'
-  211 | #define out_arch(type,endian,a,v)       __raw_write##type(cpu_to_##endian(v),a)
-      |                                         ^~~~~~~~~~~
-arch/arm/include/asm/io.h:223:25: note: in expansion of macro 'out_arch'
-  223 | #define out_be32(a,v)   out_arch(l,be32,a,v)
-      |                         ^~~~~~~~
-drivers/spi/fsl_dspi.c:127:17: note: in expansion of macro 'out_be32'
-  127 |                 out_be32(addr, val) : out_le32(addr, val);
-      |                 ^~~~~~~~
-
-So adjust the current macros and code to be compatible with the upcoming
-change.
-
-Upstream-Status: Backport [https://github.com/u-boot/u-boot/commit/b56c0632ad62]
-Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
-Reviewed-by: Tom Rini <trini@konsulko.com>
-Signed-off-by: Fabio Estevam <festevam@gmail.com>
----
- drivers/spi/fsl_dspi.c |  6 ++++--
- include/fsl_ifc.h      | 24 ++++++++++++------------
- 2 files changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/spi/fsl_dspi.c b/drivers/spi/fsl_dspi.c
-index f2393c041f44..545561ad1169 100644
---- a/drivers/spi/fsl_dspi.c
-+++ b/drivers/spi/fsl_dspi.c
-@@ -123,8 +123,10 @@ static uint dspi_read32(uint flags, uint *addr)
- 
- static void dspi_write32(uint flags, uint *addr, uint val)
- {
--       flags & DSPI_FLAG_REGMAP_ENDIAN_BIG ?
--               out_be32(addr, val) : out_le32(addr, val);
-+       if (flags & DSPI_FLAG_REGMAP_ENDIAN_BIG)
-+               out_be32(addr, val);
-+       else
-+               out_le32(addr, val);
- }
- 
- static void dspi_halt(struct fsl_dspi_priv *priv, u8 halt)
-diff --git a/include/fsl_ifc.h b/include/fsl_ifc.h
-index 3ac226879303..1c363115beb2 100644
---- a/include/fsl_ifc.h
-+++ b/include/fsl_ifc.h
-@@ -803,29 +803,29 @@ void init_final_memctl_regs(void);
-        ((struct fsl_ifc_fcm *)CFG_SYS_IFC_ADDR)
- 
- #define get_ifc_cspr_ext(i)    \
--               (ifc_in32(&(IFC_FCM_BASE_ADDR)->cspr_cs[i].cspr_ext))
-+               ifc_in32(&(IFC_FCM_BASE_ADDR)->cspr_cs[i].cspr_ext)
- #define get_ifc_cspr(i)                \
--               (ifc_in32(&(IFC_FCM_BASE_ADDR)->cspr_cs[i].cspr))
-+               ifc_in32(&(IFC_FCM_BASE_ADDR)->cspr_cs[i].cspr)
- #define get_ifc_csor_ext(i)    \
--               (ifc_in32(&(IFC_FCM_BASE_ADDR)->csor_cs[i].csor_ext))
-+               ifc_in32(&(IFC_FCM_BASE_ADDR)->csor_cs[i].csor_ext)
- #define get_ifc_csor(i)                \
--               (ifc_in32(&(IFC_FCM_BASE_ADDR)->csor_cs[i].csor))
-+               ifc_in32(&(IFC_FCM_BASE_ADDR)->csor_cs[i].csor)
- #define get_ifc_amask(i)       \
--               (ifc_in32(&(IFC_FCM_BASE_ADDR)->amask_cs[i].amask))
-+               ifc_in32(&(IFC_FCM_BASE_ADDR)->amask_cs[i].amask)
- #define get_ifc_ftim(i, j)     \
--               (ifc_in32(&(IFC_FCM_BASE_ADDR)->ftim_cs[i].ftim[j]))
-+               ifc_in32(&(IFC_FCM_BASE_ADDR)->ftim_cs[i].ftim[j])
- #define set_ifc_cspr_ext(i, v) \
--               (ifc_out32(&(IFC_FCM_BASE_ADDR)->cspr_cs[i].cspr_ext, v))
-+               ifc_out32(&(IFC_FCM_BASE_ADDR)->cspr_cs[i].cspr_ext, v)
- #define set_ifc_cspr(i, v)     \
--               (ifc_out32(&(IFC_FCM_BASE_ADDR)->cspr_cs[i].cspr, v))
-+               ifc_out32(&(IFC_FCM_BASE_ADDR)->cspr_cs[i].cspr, v)
- #define set_ifc_csor_ext(i, v) \
--               (ifc_out32(&(IFC_FCM_BASE_ADDR)->csor_cs[i].csor_ext, v))
-+               ifc_out32(&(IFC_FCM_BASE_ADDR)->csor_cs[i].csor_ext, v)
- #define set_ifc_csor(i, v)     \
--               (ifc_out32(&(IFC_FCM_BASE_ADDR)->csor_cs[i].csor, v))
-+               ifc_out32(&(IFC_FCM_BASE_ADDR)->csor_cs[i].csor, v)
- #define set_ifc_amask(i, v)    \
--               (ifc_out32(&(IFC_FCM_BASE_ADDR)->amask_cs[i].amask, v))
-+               ifc_out32(&(IFC_FCM_BASE_ADDR)->amask_cs[i].amask, v)
- #define set_ifc_ftim(i, j, v)  \
--               (ifc_out32(&(IFC_FCM_BASE_ADDR)->ftim_cs[i].ftim[j], v))
-+               ifc_out32(&(IFC_FCM_BASE_ADDR)->ftim_cs[i].ftim[j], v)
- 
- enum ifc_chip_sel {
-        IFC_CS0,
--- 
-2.34.1
-
diff --git a/meta/recipes-bsp/u-boot/files/0002-arm-io.h-Fix-io-accessors-for-KVM.patch b/meta/recipes-bsp/u-boot/files/0002-arm-io.h-Fix-io-accessors-for-KVM.patch
deleted file mode 100644
index 558d753d4a..0000000000
--- a/meta/recipes-bsp/u-boot/files/0002-arm-io.h-Fix-io-accessors-for-KVM.patch
+++ /dev/null
@@ -1,310 +0,0 @@
-From 2fc16d8de5bbe2a40ab25445936150c3250a9077 Mon Sep 17 00:00:00 2001
-From: Ilias Apalodimas <ilias.apalodimas@linaro.org>
-Date: Wed, 18 Jun 2025 09:58:13 +0300
-Subject: [PATCH 2/3] arm: io.h: Fix io accessors for KVM
-
-commit 2e2c2a5e72a8 ("arm: qemu: override flash accessors to use virtualizable instructions")
-explains why we can't have instructions with multiple output registers
-when running under QEMU + KVM and the instruction leads to an exception
-to the hypervisor.
-
-USB XHCI is such a case (MMIO) where a ldr w1, [x0], #4 is emitted for
-xhci_start() which works fine with QEMU but crashes for QEMU + KVM.
-
-These instructions cannot be emulated by KVM as they do not produce
-syndrome information data that KVM can use to infer the destination
-register, the faulting address, whether it was a load or store, or
-if it's a 32 or 64 bit general-purpose register.
-As a result an external abort is injected from QEMU, via ext_dabt_pending
-to KVM and we end up throwing an exception that looks like
-
- U-Boot 2025.07-rc4 (Jun 10 2025 - 12:00:15 +0000)
- [...]
- Register 8001040 NbrPorts 8
- Starting the controller
- "Synchronous Abort" handler, esr 0x96000010, far 0x10100040
- elr: 000000000005b1c8 lr : 000000000005b1ac (reloc)
- elr: 00000000476fc1c8 lr : 00000000476fc1ac
- x0 : 0000000010100040 x1 : 0000000000000001
- x2 : 0000000000000000 x3 : 0000000000003e80
- x4 : 0000000000000000 x5 : 00000000477a5694
- x6 : 0000000000000038 x7 : 000000004666f360
- x8 : 0000000000000000 x9 : 00000000ffffffd8
- x10: 000000000000000d x11: 0000000000000006
- x12: 0000000046560a78 x13: 0000000046560dd0
- x14: 00000000ffffffff x15: 000000004666eed2
- x16: 00000000476ee2f0 x17: 0000000000000000
- x18: 0000000046660dd0 x19: 000000004666f480
- x20: 0000000000000000 x21: 0000000010100040
- x22: 0000000010100000 x23: 0000000000000000
- x24: 0000000000000000 x25: 0000000000000000
- x26: 0000000000000000 x27: 0000000000000000
- x28: 0000000000000000 x29: 000000004666f360
-
- Code: d5033fbf aa1503e0 5287d003 52800002 (b8004401)
- Resetting CPU ...
-
-There are two problems making this the default.
-- It will emit ldr + add or str + add instead of ldr/str(post increment)
-  in somne cases
-- Some platforms that depend on TPL/SPL grow in size enough so that the
-  binary doesn't fit anymore.
-
-So let's add proper I/O accessors add a Kconfig option
-to turn it off by default apart from our QEMU builds.
-
-Upstream-Status: Backport [https://github.com/u-boot/u-boot/commit/dc512700ad46]
-Reported-by: Mikko Rapeli <mikko.rapeli@linaro.org>
-Tested-by: Mikko Rapeli <mikko.rapeli@linaro.org>
-Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
-Signed-off-by: Fabio Estevam <festevam@gmail.com>
----
- arch/arm/Kconfig          |  12 +++
- arch/arm/include/asm/io.h | 152 ++++++++++++++++++++++++++++----------
- 2 files changed, 124 insertions(+), 40 deletions(-)
-
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 6ff3f2750ea8..f6430a5aaf07 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -108,6 +108,18 @@ config LNX_KRNL_IMG_TEXT_OFFSET_BASE
-          The value subtracted from CONFIG_TEXT_BASE to calculate the
-          TEXT_OFFSET value written to the Linux kernel image header.
- 
-+config KVM_VIRT_INS
-+       bool "Emit virtualizable instructions"
-+       help
-+         Instructions in the ARM ISA that have multiple output registers,
-+         can't be used if the instruction leads to an exception to the hypervisor.
-+         These instructions cannot be emulated by KVM because they do not produce
-+         syndrome information data that KVM can use to infer the destination
-+         register, the faulting address, whether it was a load or store,
-+         if it's a 32 or 64 bit general-purpose register amongst other things.
-+         Use this to produce virtualizable instructions if you plan to run U-Boot
-+         with KVM.
-+
- config NVIC
-        bool
- 
-diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
-index 89b1015bc4d3..85ec0e6937e8 100644
---- a/arch/arm/include/asm/io.h
-+++ b/arch/arm/include/asm/io.h
-@@ -20,23 +20,108 @@ static inline void sync(void)
- {
- }
- 
--/* Generic virtual read/write. */
--#define __arch_getb(a)                 (*(volatile unsigned char *)(a))
--#define __arch_getw(a)                 (*(volatile unsigned short *)(a))
--#define __arch_getl(a)                 (*(volatile unsigned int *)(a))
--#define __arch_getq(a)                 (*(volatile unsigned long long *)(a))
-+#ifdef CONFIG_ARM64
-+#define __W    "w"
-+#else
-+#define __W
-+#endif
-+
-+#if CONFIG_IS_ENABLED(SYS_THUMB_BUILD)
-+#define __R "l"
-+#define __RM "=l"
-+#else
-+#define __R "r"
-+#define __RM "=r"
-+#endif
- 
--#define __arch_putb(v,a)               (*(volatile unsigned char *)(a) = (v))
--#define __arch_putw(v,a)               (*(volatile unsigned short *)(a) = (v))
--#define __arch_putl(v,a)               (*(volatile unsigned int *)(a) = (v))
--#define __arch_putq(v,a)               (*(volatile unsigned long long *)(a) = (v))
-+#ifdef CONFIG_KVM_VIRT_INS
-+/*
-+ * The __raw_writeX/__raw_readX below should be converted to static inline
-+ * functions. However doing so produces a lot of compilation warnings when
-+ * called with a raw address. Convert these once the callers have been fixed.
-+ */
-+#define __raw_writeb(val, addr)                        \
-+       do {                                    \
-+               asm volatile("strb %" __W "0, [%1]"     \
-+               :                               \
-+               : __R ((u8)(val)), __R (addr)); \
-+       } while (0)
-+
-+#define __raw_readb(addr)                              \
-+       ({                                              \
-+               u32 __val;                              \
-+               asm volatile("ldrb %" __W "0, [%1]"             \
-+               : __RM (__val)                          \
-+               : __R (addr));                          \
-+               __val;                                  \
-+       })
-+
-+#define __raw_writew(val, addr)                        \
-+       do {                                    \
-+               asm volatile("strh %" __W "0, [%1]"     \
-+               :                                       \
-+               : __R ((u16)(val)), __R (addr));        \
-+       } while (0)
-+
-+#define __raw_readw(addr)                              \
-+       ({                                              \
-+               u32 __val;                              \
-+               asm volatile("ldrh %" __W "0, [%1]"             \
-+               : __RM (__val)                          \
-+               : __R (addr));                          \
-+       __val;                                          \
-+    })
-+
-+#define __raw_writel(val, addr)                                \
-+       do {                                            \
-+               asm volatile("str %" __W "0, [%1]"              \
-+               :                                       \
-+               : __R ((u32)(val)), __R (addr));        \
-+       } while (0)
-+
-+#define __raw_readl(addr)                              \
-+       ({                                              \
-+               u32 __val;                              \
-+               asm volatile("ldr %" __W "0, [%1]"              \
-+               : __RM (__val)                          \
-+               : __R (addr));                          \
-+               __val;                                  \
-+       })
-+
-+#define __raw_writeq(val, addr)                                \
-+       do {                                            \
-+               asm volatile("str %0, [%1]"             \
-+               :                                       \
-+               : __R ((u64)(val)), __R (addr));        \
-+       } while (0)
-+
-+#define __raw_readq(addr)                              \
-+       ({                                              \
-+               u64 __val;                              \
-+               asm volatile("ldr %0, [%1]"             \
-+               : __RM (__val)                          \
-+               : __R (addr));                          \
-+               __val;                                  \
-+           })
-+#else
-+/* Generic virtual read/write. */
-+#define __raw_readb(a)                 (*(volatile unsigned char *)(a))
-+#define __raw_readw(a)                 (*(volatile unsigned short *)(a))
-+#define __raw_readl(a)                 (*(volatile unsigned int *)(a))
-+#define __raw_readq(a)                 (*(volatile unsigned long long *)(a))
-+
-+#define __raw_writeb(v, a)             (*(volatile unsigned char *)(a) = (v))
-+#define __raw_writew(v, a)             (*(volatile unsigned short *)(a) = (v))
-+#define __raw_writel(v, a)             (*(volatile unsigned int *)(a) = (v))
-+#define __raw_writeq(v, a)             (*(volatile unsigned long long *)(a) = (v))
-+#endif
- 
- static inline void __raw_writesb(unsigned long addr, const void *data,
-                                 int bytelen)
- {
-        uint8_t *buf = (uint8_t *)data;
-        while(bytelen--)
--               __arch_putb(*buf++, addr);
-+               __raw_writeb(*buf++, addr);
- }
- 
- static inline void __raw_writesw(unsigned long addr, const void *data,
-@@ -44,7 +129,7 @@ static inline void __raw_writesw(unsigned long addr, const void *data,
- {
-        uint16_t *buf = (uint16_t *)data;
-        while(wordlen--)
--               __arch_putw(*buf++, addr);
-+               __raw_writew(*buf++, addr);
- }
- 
- static inline void __raw_writesl(unsigned long addr, const void *data,
-@@ -52,40 +137,30 @@ static inline void __raw_writesl(unsigned long addr, const void *data,
- {
-        uint32_t *buf = (uint32_t *)data;
-        while(longlen--)
--               __arch_putl(*buf++, addr);
-+               __raw_writel(*buf++, addr);
- }
- 
- static inline void __raw_readsb(unsigned long addr, void *data, int bytelen)
- {
-        uint8_t *buf = (uint8_t *)data;
-        while(bytelen--)
--               *buf++ = __arch_getb(addr);
-+               *buf++ = __raw_readb(addr);
- }
- 
- static inline void __raw_readsw(unsigned long addr, void *data, int wordlen)
- {
-        uint16_t *buf = (uint16_t *)data;
-        while(wordlen--)
--               *buf++ = __arch_getw(addr);
-+               *buf++ = __raw_readw(addr);
- }
- 
- static inline void __raw_readsl(unsigned long addr, void *data, int longlen)
- {
-        uint32_t *buf = (uint32_t *)data;
-        while(longlen--)
--               *buf++ = __arch_getl(addr);
-+               *buf++ = __raw_readl(addr);
- }
- 
--#define __raw_writeb(v,a)      __arch_putb(v,a)
--#define __raw_writew(v,a)      __arch_putw(v,a)
--#define __raw_writel(v,a)      __arch_putl(v,a)
--#define __raw_writeq(v,a)      __arch_putq(v,a)
--
--#define __raw_readb(a)         __arch_getb(a)
--#define __raw_readw(a)         __arch_getw(a)
--#define __raw_readl(a)         __arch_getl(a)
--#define __raw_readq(a)         __arch_getq(a)
--
- /*
-  * TODO: The kernel offers some more advanced versions of barriers, it might
-  * have some advantages to use them instead of the simple one here.
-@@ -98,15 +173,15 @@ static inline void __raw_readsl(unsigned long addr, void *data, int longlen)
- 
- #define smp_processor_id()     0
- 
--#define writeb(v,c)    ({ u8  __v = v; __iowmb(); __arch_putb(__v,c); __v; })
--#define writew(v,c)    ({ u16 __v = v; __iowmb(); __arch_putw(__v,c); __v; })
--#define writel(v,c)    ({ u32 __v = v; __iowmb(); __arch_putl(__v,c); __v; })
--#define writeq(v,c)    ({ u64 __v = v; __iowmb(); __arch_putq(__v,c); __v; })
-+#define writeb(v, c)   ({ u8  __v = v; __iowmb(); writeb_relaxed(__v, c); __v; })
-+#define writew(v, c)   ({ u16 __v = v; __iowmb(); writew_relaxed(__v, c); __v; })
-+#define writel(v, c)   ({ u32 __v = v; __iowmb(); writel_relaxed(__v, c); __v; })
-+#define writeq(v, c)   ({ u64 __v = v; __iowmb(); writeq_relaxed(__v, c); __v; })
- 
--#define readb(c)       ({ u8  __v = __arch_getb(c); __iormb(); __v; })
--#define readw(c)       ({ u16 __v = __arch_getw(c); __iormb(); __v; })
--#define readl(c)       ({ u32 __v = __arch_getl(c); __iormb(); __v; })
--#define readq(c)       ({ u64 __v = __arch_getq(c); __iormb(); __v; })
-+#define readb(c)       ({ u8  __v = readb_relaxed(c); __iormb(); __v; })
-+#define readw(c)       ({ u16 __v = readw_relaxed(c); __iormb(); __v; })
-+#define readl(c)       ({ u32 __v = readl_relaxed(c); __iormb(); __v; })
-+#define readq(c)       ({ u64 __v = readq_relaxed(c); __iormb(); __v; })
- 
- /*
-  * Relaxed I/O memory access primitives. These follow the Device memory
-@@ -121,13 +196,10 @@ static inline void __raw_readsl(unsigned long addr, void *data, int longlen)
- #define readq_relaxed(c)       ({ u64 __r = le64_to_cpu((__force __le64) \
-                                                __raw_readq(c)); __r; })
- 
--#define writeb_relaxed(v, c)   ((void)__raw_writeb((v), (c)))
--#define writew_relaxed(v, c)   ((void)__raw_writew((__force u16) \
--                                                   cpu_to_le16(v), (c)))
--#define writel_relaxed(v, c)   ((void)__raw_writel((__force u32) \
--                                                   cpu_to_le32(v), (c)))
--#define writeq_relaxed(v, c)   ((void)__raw_writeq((__force u64) \
--                                                   cpu_to_le64(v), (c)))
-+#define writeb_relaxed(v, c)   __raw_writeb((v), (c))
-+#define writew_relaxed(v, c)   __raw_writew((__force u16)cpu_to_le16(v), (c))
-+#define writel_relaxed(v, c)   __raw_writel((__force u32)cpu_to_le32(v), (c))
-+#define writeq_relaxed(v, c)   __raw_writeq((__force u64)cpu_to_le64(v), (c))
- 
- /*
-  * The compiler seems to be incapable of optimising constants
--- 
-2.34.1
-
diff --git a/meta/recipes-bsp/u-boot/files/0003-qemu-arm-Enable-virtualizable-IO-accessors.patch b/meta/recipes-bsp/u-boot/files/0003-qemu-arm-Enable-virtualizable-IO-accessors.patch
deleted file mode 100644
index 520c9226b4..0000000000
--- a/meta/recipes-bsp/u-boot/files/0003-qemu-arm-Enable-virtualizable-IO-accessors.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cb6120b4bfd8b24dde7e0d1eda882e203a849d3f Mon Sep 17 00:00:00 2001
-From: Ilias Apalodimas <ilias.apalodimas@linaro.org>
-Date: Wed, 18 Jun 2025 09:58:14 +0300
-Subject: [PATCH 3/3] qemu: arm: Enable virtualizable IO accessors
-
-We recently added IO accessors that will work with KVM for any MMIO
-access that casues an exception to the hypervisor. Enable them by
-default for QEMU.
-
-Upstream-Status: Backport [https://github.com/u-boot/u-boot/commit/fcc60481ae75]
-Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
-Tested-by: Mikko Rapeli <mikko.rapeli@linaro.org>
-Signed-off-by: Fabio Estevam <festevam@gmail.com>
----
- configs/qemu_arm64_defconfig | 1 +
- configs/qemu_arm_defconfig   | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig
-index 72bd255eafa3..39afb837e411 100644
---- a/configs/qemu_arm64_defconfig
-+++ b/configs/qemu_arm64_defconfig
-@@ -1,4 +1,5 @@
- CONFIG_ARM=y
-+CONFIG_KVM_VIRT_INS=y
- CONFIG_ARCH_QEMU=y
- CONFIG_SYS_MALLOC_LEN=0x1000000
- CONFIG_BLOBLIST_SIZE_RELOC=0x2000
-diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig
-index f13001390d4d..92ba48f6af97 100644
---- a/configs/qemu_arm_defconfig
-+++ b/configs/qemu_arm_defconfig
-@@ -1,4 +1,5 @@
- CONFIG_ARM=y
-+CONFIG_KVM_VIRT_INS=y
- CONFIG_ARM_SMCCC=y
- CONFIG_ARCH_QEMU=y
- CONFIG_SYS_MALLOC_LEN=0x1000000
--- 
-2.34.1
-
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index ea55545db3..93ff0ca6ca 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -12,15 +12,9 @@ PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "e37de002fac3895e8d0b60ae2015e17bb33e2b5b"
-
-SRC_URI = "\
-    git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV} \
-    file://0001-Makefile-add-dependency-from-lib-to-arch-ARCH-lib.patch \
-    file://0001-nxp-Prepare-macros-for-KVM-changes.patch \
-    file://0002-arm-io.h-Fix-io-accessors-for-KVM.patch \
-    file://0003-qemu-arm-Enable-virtualizable-IO-accessors.patch \
-"
+SRCREV = "e50b1e8715011def8aff1588081a2649a2c6cd47"
+
+SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}"
 
 SRC_URI_RISCV = "\
     file://u-boot-riscv-isa_clear.cfg \
diff --git a/meta/recipes-bsp/u-boot/u-boot-configure.inc b/meta/recipes-bsp/u-boot/u-boot-configure.inc
index a15511f8b2..bada506b66 100644
--- a/meta/recipes-bsp/u-boot/u-boot-configure.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-configure.inc
@@ -33,7 +33,19 @@ uboot_configure_config () {
     config=$1
     type=$2
 
-    oe_runmake -C ${S} O=${B}/${config} ${config}
+    unset k
+    IFS="?"
+    uboot_config_make_opts="${UBOOT_CONFIG_MAKE_OPTS}"
+    for config_make_opts in $uboot_config_make_opts; do
+        k=$(expr $k + 1);
+        if [ $k -eq $i ]; then
+            break
+        fi
+    done
+    unset IFS
+    unset k
+
+    oe_runmake -C ${S} O=${B}/${config} ${config_make_opts} ${UBOOT_MAKE_OPTS} ${config}
     if [ -n "${@' '.join(find_cfgs(d))}" ]; then
         merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))}
         oe_runmake -C ${S} O=${B}/${config} oldconfig
@@ -42,9 +54,9 @@ uboot_configure_config () {
 
 uboot_configure () {
     if [ -n "${UBOOT_MACHINE}" ]; then
-        oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE}
+        oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_OPTS} ${UBOOT_MACHINE}
     else
-        oe_runmake -C ${S} O=${B} oldconfig
+        oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_OPTS} oldconfig
     fi
     merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
     cml1_do_configure
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2025.07.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2025.10.bb
index 7eaf721ca8..7eaf721ca8 100644
--- a/meta/recipes-bsp/u-boot/u-boot-tools_2025.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-tools_2025.10.bb
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index b7242de5de..e0a69e740e 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -75,7 +75,19 @@ uboot_compile_config () {
     config=$2
     type=$3
 
-    oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET}
+    unset k
+    IFS="?"
+    uboot_config_make_opts="${UBOOT_CONFIG_MAKE_OPTS}"
+    for config_make_opts in $uboot_config_make_opts; do
+        k=$(expr $k + 1);
+        if [ $k -eq $i ]; then
+            break
+        fi
+    done
+    unset IFS
+    unset k
+
+    oe_runmake -C ${S} O=${B}/${config} ${config_make_opts} ${UBOOT_MAKE_OPTS} ${UBOOT_MAKE_TARGET}
 
     unset k
     for binary in ${UBOOT_BINARIES}; do
@@ -102,7 +114,7 @@ uboot_compile_config_copy_binary () {
 }
 
 uboot_compile () {
-    oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET}
+    oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_OPTS} ${UBOOT_MAKE_TARGET}
 
     # Generate the uboot-initial-env
     if [ -n "${UBOOT_INITIAL_ENV}" ]; then
diff --git a/meta/recipes-bsp/u-boot/u-boot_2025.07.bb b/meta/recipes-bsp/u-boot/u-boot_2025.10.bb
index 25f264c961..25f264c961 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2025.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2025.10.bb
diff --git a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch
index 687d682976..dadc034c91 100644
--- a/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch
+++ b/meta/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch
@@ -38,7 +38,7 @@ diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tm
 index 09303c4..011bda1 100644
 --- a/Configurations/unix-Makefile.tmpl
 +++ b/Configurations/unix-Makefile.tmpl
-@@ -502,13 +502,27 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (),
+@@ -513,13 +513,27 @@ BIN_LDFLAGS={- join(' ', $target{bin_lflags} || (),
                           '$(CNF_LDFLAGS)', '$(LDFLAGS)') -}
  BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS)
  
diff --git a/meta/recipes-connectivity/openssl/openssl_3.5.2.bb b/meta/recipes-connectivity/openssl/openssl_3.5.4.bb
index 396e69d7e7..c222b1533b 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.5.2.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.5.4.bb
@@ -18,7 +18,7 @@ SRC_URI:append:class-nativesdk = " \
            file://environment.d-openssl.sh \
            "
 
-SRC_URI[sha256sum] = "c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec"
+SRC_URI[sha256sum] = "967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99"
 
 inherit lib_package multilib_header multilib_script ptest perlnative manpages
 MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
diff --git a/meta/recipes-devtools/clang/clang_git.bb b/meta/recipes-devtools/clang/clang_git.bb
index ca53963590..e10c327a2a 100644
--- a/meta/recipes-devtools/clang/clang_git.bb
+++ b/meta/recipes-devtools/clang/clang_git.bb
@@ -57,7 +57,6 @@ SOLIBSDEV:mingw32 = ".pyd"
 #CMAKE_VERBOSE = "VERBOSE=1"
 
 EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \
-                  -DLLVM_APPEND_VC_REV=OFF \
                   -DLLVM_ENABLE_PIC=ON \
                   -DCLANG_DEFAULT_PIE_ON_LINUX=ON \
                   -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \
diff --git a/meta/recipes-devtools/clang/common-clang.inc b/meta/recipes-devtools/clang/common-clang.inc
index f7b7a1cf9a..47f036bc66 100644
--- a/meta/recipes-devtools/clang/common-clang.inc
+++ b/meta/recipes-devtools/clang/common-clang.inc
@@ -16,6 +16,10 @@ CLANGMD5SUM = "ff42885ed2ab98f1ecb8c1fc41205343"
 LLDMD5SUM = "ae7dc7c027b1fa89b5b013d391d3ee2b"
 LLDBMD5SUM = "2e0d44968471fcde980034dbb826bea9"
 
+# remove at next version upgrade or when output changes
+PR = "r1"
+HASHEQUIV_HASH_VERSION .= ".1"
+
 LLVM_LIBDIR_SUFFIX = "${@d.getVar('baselib').replace('lib', '')}"
 
 # set the default pigz thread
@@ -48,4 +52,8 @@ def get_clang_target_arch(bb, d):
 # install they cause non-deterministic binaries.
 EXTRA_OECMAKE += "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON"
 
+# Don't embed found git information into the version string as this
+# will include the git server URL.
+EXTRA_OECMAKE += "-DLLVM_APPEND_VC_REV=OFF"
+
 require common.inc
diff --git a/meta/recipes-devtools/clang/openmp_git.bb b/meta/recipes-devtools/clang/openmp_git.bb
index 2d86718dee..b6b1cc2978 100644
--- a/meta/recipes-devtools/clang/openmp_git.bb
+++ b/meta/recipes-devtools/clang/openmp_git.bb
@@ -18,7 +18,6 @@ inherit cmake pkgconfig perlnative python3native python3targetconfig
 DEPENDS += "elfutils libffi clang"
 
 EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                  -DLLVM_APPEND_VC_REV=OFF \
                   -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
                   -DOPENMP_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
                   -DOPENMP_STANDALONE_BUILD=ON \
diff --git a/meta/recipes-devtools/tcltk8/tcl8/0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch b/meta/recipes-devtools/tcltk8/tcl8/0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch
index 1859992838..6ba7ff4340 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch
+++ b/meta/recipes-devtools/tcltk8/tcl8/0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch
@@ -1,4 +1,4 @@
-From ff508f2e6786df697876140f21855ecb92a3ed36 Mon Sep 17 00:00:00 2001
+From 7d404d1827ffb69a2aa7b60c10b435c6f47f7bfb Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 18 Aug 2023 12:25:11 +0200
 Subject: [PATCH] generic/tcl.h: use Tcl_WideInt for seconds in Tcl_Time
@@ -19,10 +19,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/generic/tcl.h b/generic/tcl.h
-index 3a4622e..6204c57 100644
+index d8fd70a..ffff4b1 100644
 --- a/generic/tcl.h
 +++ b/generic/tcl.h
-@@ -1418,7 +1418,7 @@ typedef enum {
+@@ -1425,7 +1425,7 @@ typedef enum {
   */
  
  typedef struct Tcl_Time {
diff --git a/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch b/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch
index 6ceb297cea..ad91b9ffb3 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch
+++ b/meta/recipes-devtools/tcltk8/tcl8/alter-includedir.patch
@@ -1,4 +1,4 @@
-From 8bb8174e13c1c0e3b27fdf96a393f9fb1b7e14be Mon Sep 17 00:00:00 2001
+From bfca2e4ae32ab546f796d9c7ff7cbf542d5b2bfe Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
 Date: Tue, 22 Nov 2022 18:48:27 +0800
 Subject: [PATCH] tcl: update the header location
@@ -26,7 +26,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
  3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/unix/Makefile.in b/unix/Makefile.in
-index c3b75e3..60ed93e 100644
+index 45e7b76..5a46e6a 100644
 --- a/unix/Makefile.in
 +++ b/unix/Makefile.in
 @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR    = $(INSTALL_ROOT)$(TCL_LIBRARY)
@@ -39,7 +39,7 @@ index c3b75e3..60ed93e 100644
  # Path to the private tcl header dir:
  PRIVATE_INCLUDE_DIR    = @PRIVATE_INCLUDE_DIR@
 diff --git a/unix/configure.in b/unix/configure.in
-index 8e6726b..2345689 100644
+index 50b3e03..8a33d0c 100644
 --- a/unix/configure.in
 +++ b/unix/configure.in
 @@ -775,7 +775,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
@@ -51,7 +51,7 @@ index 8e6726b..2345689 100644
  HTML_DIR='$(DISTDIR)/html'
  
  # Note:  in the following variable, it's important to use the absolute
-@@ -898,7 +898,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
+@@ -896,7 +896,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
  TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
  
  # Install time header dir can be set via --includedir
diff --git a/meta/recipes-devtools/tcltk8/tcl8/fix_non_native_build_issue.patch b/meta/recipes-devtools/tcltk8/tcl8/fix_non_native_build_issue.patch
index 61153878fe..07a1f4d040 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/fix_non_native_build_issue.patch
+++ b/meta/recipes-devtools/tcltk8/tcl8/fix_non_native_build_issue.patch
@@ -1,4 +1,4 @@
-From 3d11e7fd9aba6251974d990286347c06582e87b9 Mon Sep 17 00:00:00 2001
+From ad7847a15163f12c24d8ecb50dffa289876dc830 Mon Sep 17 00:00:00 2001
 From: Nitin A Kamble <nitin.a.kamble@intel.com>
 Date: Fri, 13 Aug 2010 12:24:00 -0700
 Subject: [PATCH] tcl: fix a build issue
@@ -10,7 +10,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  1 file changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/unix/Makefile.in b/unix/Makefile.in
-index a2f9e21..c3b75e3 100644
+index ab2e7b5..45e7b76 100644
 --- a/unix/Makefile.in
 +++ b/unix/Makefile.in
 @@ -723,7 +723,7 @@ tcltest-real:
diff --git a/meta/recipes-devtools/tcltk8/tcl8/interp.patch b/meta/recipes-devtools/tcltk8/tcl8/interp.patch
index aeebb038e3..c6412e7775 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/interp.patch
+++ b/meta/recipes-devtools/tcltk8/tcl8/interp.patch
@@ -1,4 +1,4 @@
-From 09049beed723243d092ffaa37939dfe0f2ed6828 Mon Sep 17 00:00:00 2001
+From 2d959d1fdfbd7e020f5177b1a7ff6a08809536ca Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@arm.com>
 Date: Mon, 12 Jul 2021 14:50:13 +0100
 Subject: [PATCH] tcl: fix race in interp.test
@@ -13,10 +13,10 @@ Signed-off-by: Ross Burton <ross.burton@arm.com>
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/tests/interp.test b/tests/interp.test
-index 24ffb1b..c6460ad 100644
+index d64fdd4..9931dd1 100644
 --- a/tests/interp.test
 +++ b/tests/interp.test
-@@ -3614,17 +3614,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup {
+@@ -3651,17 +3651,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup {
          variable result
          set result [lindex $args 0]
      }
diff --git a/meta/recipes-devtools/tcltk8/tcl8/run-ptest b/meta/recipes-devtools/tcltk8/tcl8/run-ptest
index 687e06fa4b..12921d8cfd 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/run-ptest
+++ b/meta/recipes-devtools/tcltk8/tcl8/run-ptest
@@ -4,6 +4,8 @@
 export TZ="Europe/London"
 export TCL_LIBRARY=@libdir@/tcl8/ptest/library
 export ERROR_ON_FAILURES=1
+export LC_ALL=en_US.UTF-8
+export LANG=en_US.UTF-8
 
 # Some tests are overly strict with timings and fail on loaded systems.
 SKIP=""
diff --git a/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch b/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch
index 898e8241fc..0f8bd062ac 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk8/tcl8/tcl-add-soname.patch
@@ -1,4 +1,4 @@
-From 0d8e567d132e050c5d4a8d8d9257417e0679483c Mon Sep 17 00:00:00 2001
+From 2af07e2d0f0cb9f42ff982ce257e2067dcf1ec77 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <rpurdie@linux.intel.com>
 Date: Wed, 9 Dec 2009 23:59:44 +0000
 Subject: [PATCH] tcl: Add tcltk from OE.dev but with legacy staging function
@@ -11,7 +11,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/unix/Makefile.in b/unix/Makefile.in
-index bc743b3..a2f9e21 100644
+index 3efdfec..ab2e7b5 100644
 --- a/unix/Makefile.in
 +++ b/unix/Makefile.in
 @@ -812,7 +812,10 @@ install-binaries: binaries
diff --git a/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch b/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch
index f2a37add7d..12e1937aa1 100644
--- a/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch
+++ b/meta/recipes-devtools/tcltk8/tcl8/tcl-remove-hardcoded-install-path.patch
@@ -1,4 +1,4 @@
-From 6e3cbc3600ac474776e92eb9a88abcb74299c321 Mon Sep 17 00:00:00 2001
+From 0b479a0dc845f9926cb40c13d86e55391a89fe98 Mon Sep 17 00:00:00 2001
 From: "Song.Li" <Song.Li@windriver.com>
 Date: Wed, 1 Aug 2012 19:05:51 +0800
 Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target
@@ -17,7 +17,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/unix/configure.in b/unix/configure.in
-index e88ec3c..8e6726b 100644
+index ed07ca5..50b3e03 100644
 --- a/unix/configure.in
 +++ b/unix/configure.in
 @@ -774,7 +774,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
diff --git a/meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb b/meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb
index 225f04be48..b97b20abd5 100644
--- a/meta/recipes-devtools/tcltk8/tcl8_8.6.16.bb
+++ b/meta/recipes-devtools/tcltk8/tcl8_8.6.17.bb
@@ -25,7 +25,7 @@ SRC_URI = "${BASE_SRC_URI} \
            file://run-ptest \
            file://0001-generic-tcl.h-use-Tcl_WideInt-for-seconds-in-Tcl_Tim.patch \
            "
-SRC_URI[sha256sum] = "3b371386a9a928eecdbf263bcab7d6a531e620ca3fbab4fdeeb3d6a9a56f38e9"
+SRC_URI[sha256sum] = "a1d8cbe44b38beaa29fc2130c4e7b79b8bf02e2bcc028ffefd7a25a2122202a0"
 
 SRC_URI:class-native = "${BASE_SRC_URI}"
 
@@ -74,7 +74,7 @@ FILES:${PN}-dev += "${libdir}/tcl8Config.sh ${libdir}/tcl8ooConfig.sh"
 
 # isn't getting picked up by shlibs code
 RDEPENDS:${PN} += "tcl8-lib"
-RDEPENDS:${PN}-ptest += "libgcc"
+RDEPENDS:${PN}-ptest += "libgcc locale-base-en-us tzdata"
 
 BBCLASSEXTEND = "native nativesdk"
 
diff --git a/meta/recipes-extended/ghostscript/ghostscript_10.06.0.bb b/meta/recipes-extended/ghostscript/ghostscript_10.06.0.bb
index 4f6cb45412..4cea898432 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_10.06.0.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_10.06.0.bb
@@ -47,7 +47,7 @@ EXTRA_OECONF:append:mipsarcho32 = " --with-large_color_index=0"
 EXTRA_OECONF:append:armv7a = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}"
 EXTRA_OECONF:append:armv7ve = "${@bb.utils.contains('TUNE_FEATURES','neon','',' --disable-neon',d)}"
 
-TARGET_CFLAGS += "-std=gnu17 -fPIC"
+TARGET_CFLAGS += "-std=gnu17 -Wno-error=declaration-after-statement -fPIC"
 
 # Uses autoconf but not automake, can't do out-of-tree
 inherit autotools-brokensep pkgconfig
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 63c0cf1ac0..060e287f26 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -38,7 +38,7 @@ do_compile[dirs] =+ "${B}/temp/"
 
 PACKAGECONFIG ??= " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glx', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'opencl wayland', d)} \
 "
 PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut,"
 PACKAGECONFIG[glx] = "-DPIGLIT_BUILD_GLX_TESTS=ON,-DPIGLIT_BUILD_GLX_TESTS=OFF"
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20250917.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20250917.bb
index f8d8decfe5..e6d6bcf308 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250917.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250917.bb
@@ -5,9 +5,61 @@ that contains firmware binary blobs necessary for partial or full functionality
 of certain hardware devices."
 SECTION = "kernel"
 
+REMOVE_UNLICENSED = ""
+
+# For acenic - Alteon AceNIC Gigabit Ethernet card
+REMOVE_UNLICENSED += "acenic/tg1.bin acenic/tg2.bin"
+
+# For emi62 - EMI 6|2m USB Audio interface
+REMOVE_UNLICENSED += "emi62/bitstream.fw emi62/loader.fw emi62/midi.fw emi62/spdif.fw"
+
+# For snd-maestro3 - ESS Allegro Maestro3 audio device
+REMOVE_UNLICENSED += "ess/maestro3_assp_kernel.fw ess/maestro3_assp_minisrc.fw"
+
+# For s2255drv
+REMOVE_UNLICENSED += "f2255usb.bin"
+
+# For snd-korg1212 - Korg 1212 IO audio device
+REMOVE_UNLICENSED += "korg/k1212.dsp"
+
+# For lgs8gxx - Legend Silicon GB20600 demodulator driver
+REMOVE_UNLICENSED += "lgs8g75.fw"
+
+# For ti_usb_3410_5052 - Multi-Tech USB cell modems
+REMOVE_UNLICENSED += "mts_cdma.fw mts_gsm.fw mts_edge.fw mts_mt9234mu.fw mts_mt9234zba.fw"
+
+# For myri_sbus - MyriCOM Gigabit Ethernet
+REMOVE_UNLICENSED += "myricom/lanai.bin"
+
+# For qlogicpti - PTI Qlogic, ISP Driver
+REMOVE_UNLICENSED += "qlogic/isp1000.bin"
+
+# For cassini - Sun Cassini
+REMOVE_UNLICENSED += "sun/cassini.bin"
+
+# For dvb-ttusb-budget - Technotrend/Hauppauge Nova-USB devices
+REMOVE_UNLICENSED += "ttusb-budget/dspbootcode.bin"
+
+# For ueagle-atm - Driver for USB ADSL Modems based on Eagle I,II,III
+REMOVE_UNLICENSED += "ueagle-atm/930-fpga.bin ueagle-atm/CMVeiWO.bin ueagle-atm/CMVepFR10.bin ueagle-atm/DSP9p.bin ueagle-atm/eagleIII.fw ueagle-atm/adi930.fw ueagle-atm/CMVep.bin ueagle-atm/CMVepFR.bin ueagle-atm/DSPei.bin ueagle-atm/CMV9i.bin ueagle-atm/CMVepES03.bin ueagle-atm/CMVepIT.bin ueagle-atm/DSPep.bin ueagle-atm/CMV9p.bin ueagle-atm/CMVepES.bin ueagle-atm/CMVepWO.bin ueagle-atm/eagleI.fw ueagle-atm/CMVei.bin ueagle-atm/CMVepFR04.bin ueagle-atm/DSP9i.bin ueagle-atm/eagleII.fw"
+
+# For vicam - USB 3com HomeConnect (aka vicam)
+REMOVE_UNLICENSED += "vicam/firmware.fw"
+
+# For yam - YAM driver for AX.25
+REMOVE_UNLICENSED += "yam/1200.bin yam/9600.bin"
+
+# For snd-wavefront - ISA WaveFront sound card
+REMOVE_UNLICENSED += "yamaha/yss225_registers.bin"
+
+# For snd-ymfpci - Yamaha YMF724/740/744/754 audio devices
+REMOVE_UNLICENSED += "yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw yamaha/ds1e_ctrl.fw"
+
+
 LICENSE = "\
     Firmware-Abilis \
     & Firmware-adsp_sst \
+    & Firmware-advansys \
     & Firmware-aeonsemi \
     & Firmware-agere \
     & Firmware-airoha \
@@ -29,6 +81,7 @@ LICENSE = "\
     & Firmware-bnx2x \
     & Firmware-broadcom_bcm43xx \
     & Firmware-ca0132 \
+    & Firmware-cadence \
     & Firmware-cavium \
     & Firmware-chelsio_firmware \
     & Firmware-cirrus \
@@ -64,6 +117,7 @@ LICENSE = "\
     & Firmware-IntcSST2 \
     & Firmware-kaweth \
     & Firmware-keyspan \
+    & Firmware-lenovo \
     & Firmware-linaro \
     & Firmware-Lontium \
     & Firmware-mali_csffw \
@@ -122,11 +176,18 @@ LICENSE = "\
     & Firmware-xc5000c \
     & Firmware-xe \
     & WHENCE \
+    & GPL-1.0-only \
     & GPL-2.0-or-later \
+    & GPL-2.0-only \
+    & GPL-3.0-only \
+    & MPL-1.1 \
+    & Apache-2.0 \
+    & MIT \
 "
 
 LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \
+                    file://LICENCE.advansys;md5=bca735476602a7bcb187c7f8bf4a31d5 \
                     file://LICENSE.aeonsemi;md5=521c00bae0077c90d6ffb9ccf66905ae \
                     file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \
                     file://LICENSE.airoha;md5=fa3dedb960e2673aea51aa509f7b537d \
@@ -184,6 +245,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     file://LICENSE.ixp4xx;md5=ddc5cd6cbc6745343926fe7ecc2cdeb2 \
                     file://LICENCE.kaweth;md5=b1d876e562f4b3b8d391ad8395dfe03f \
                     file://LICENCE.keyspan;md5=676af26017c45772c972ce4a75d467d9 \
+                    file://LICENCE.lenovo;md5=7f25420b5c27211f7bf33bebb3042ce4 \
                     file://LICENCE.linaro;md5=936d91e71cf9cd30e733db4bf11661cc \
                     file://LICENSE.Lontium;md5=4ec8dc582ff7295f39e2ca6a7b0be2b6 \
                     file://LICENCE.mali_csffw;md5=e064aaec4d21ef856e1b76a6f5dc435f \
@@ -252,6 +314,7 @@ WHENCE_CHKSUM  = "a12ddaaab7162785af9d79b76132d185"
 # so that the license files will be copied from fetched source
 NO_GENERIC_LICENSE[Firmware-Abilis] = "LICENCE.Abilis"
 NO_GENERIC_LICENSE[Firmware-adsp_sst] = "LICENCE.adsp_sst"
+NO_GENERIC_LICENSE[Firmware-advansys] = "LICENCE.advansys"
 NO_GENERIC_LICENSE[Firmware-aeonsemi] = "LICENSE.aeonsemi"
 NO_GENERIC_LICENSE[Firmware-agere] = "LICENCE.agere"
 NO_GENERIC_LICENSE[Firmware-airoha] = "LICENSE.airoha"
@@ -309,6 +372,7 @@ NO_GENERIC_LICENSE[Firmware-iwlwifi_firmware] = "LICENCE.iwlwifi_firmware"
 NO_GENERIC_LICENSE[Firmware-ixp4xx] = "LICENSE.ixp4xx"
 NO_GENERIC_LICENSE[Firmware-kaweth] = "LICENCE.kaweth"
 NO_GENERIC_LICENSE[Firmware-keyspan] = "LICENCE.keyspan"
+NO_GENERIC_LICENSE[Firmware-lenovo] = "LICENCE.lenovo"
 NO_GENERIC_LICENSE[Firmware-linaro] = "LICENCE.linaro"
 NO_GENERIC_LICENSE[Firmware-Lontium] = "LICENSE.Lontium"
 NO_GENERIC_LICENSE[Firmware-mali_csffw] = "LICENCE.mali_csffw"
@@ -416,6 +480,21 @@ do_install() {
         fi
         cp LICEN[CS]E.* WHENCE ${D}${nonarch_base_libdir}/firmware/
         cp wfx/LICEN[CS]E.* ${D}${nonarch_base_libdir}/firmware/wfx/
+
+        # Remove all unlicensed firmware
+        for file in ${REMOVE_UNLICENSED}; do
+                echo "Remove unlicensed firmware: $file"
+                rm ${D}${nonarch_base_libdir}/firmware/$file
+                path_to_file=$(dirname $file)
+                while [ "${path_to_file}" != "." ]; do
+                        num_files=$(ls -A1 ${D}${nonarch_base_libdir}/firmware/$path_to_file | wc -l)
+                        if [ "$num_files" = "0" ]; then
+                                echo "Remove empty dir: $path_to_file"
+                                rm -rf ${D}${nonarch_base_libdir}/firmware/$path_to_file
+                        fi
+                        path_to_file=$(dirname $path_to_file)
+                done
+        done
 }
 
 PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
@@ -456,18 +535,28 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
              ${PN}-moxa-license ${PN}-moxa \
              ${PN}-sd8686 ${PN}-sd8688 ${PN}-sd8787 ${PN}-sd8797 ${PN}-sd8801 \
              ${PN}-sd8887 ${PN}-sd8897 ${PN}-sd8997 ${PN}-usb8997 \
+             ${PN}-cf8381 ${PN}-cf8385 ${PN}-gspi8682 ${PN}-gspi8686 ${PN}-gspi8688 ${PN}-sd8385 ${PN}-sd8682 \
+             ${PN}-usb8388 ${PN}-usb8682 ${PN}-sd8977 ${PN}-usb8766 ${PN}-usb8797 ${PN}-usb8801 ${PN}-usb8897 ${PN}-rvu-cptpf \
+             ${PN}-mwl8k ${PN}-mwlwifi\
              ${PN}-ti-connectivity-license ${PN}-wl1251-license ${PN}-wlcommon ${PN}-wl1251 ${PN}-wl12xx ${PN}-wl18xx ${PN}-cc33xx \
              ${PN}-ti-keystone-license ${PN}-ti-keystone \
+             ${PN}-ti-tspa-license ${PN}-ti-tas2563 ${PN}-ti-tas2781 ${PN}-ti-vpe \
+             ${PN}-ti-usb-3410-5052 \
              ${PN}-vt6656-license ${PN}-vt6656 \
-             ${PN}-rs9113 ${PN}-rs9116 \
+             ${PN}-rs9113 ${PN}-rs9116 ${PN}-rsi-91x \
              ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \
              ${PN}-rtl8761 \
              ${PN}-rtl8168 \
              ${PN}-rtl8822 \
+             ${PN}-rtl8192 ${PN}-rtl8710 ${PN}-rtl8812 \
+             ${PN}-rtl8851 ${PN}-rtl8852 ${PN}-rtl8922 \
+             ${PN}-rtl8703 ${PN}-rtl8814 \
              ${PN}-rtl-nic \
              ${PN}-cypress-license \
              ${PN}-broadcom-license \
              ${PN}-bcm-0bb4-0306 \
+             ${PN}-bcm-0a5c-6410 \
+             ${PN}-bcm43012 \
              ${PN}-bcm43143 \
              ${PN}-bcm43236b \
              ${PN}-bcm43241b0 \
@@ -500,6 +589,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
              ${PN}-bcm4373 \
              ${PN}-bcm43xx \
              ${PN}-bcm43xx-hdr \
+             ${PN}-bcm54591 \
              ${PN}-cirrus-license ${PN}-cirrus \
              ${PN}-cnm-license ${PN}-cnm \
              ${PN}-atheros-license ${PN}-ar5523 ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k ${PN}-ath3k \
@@ -570,12 +660,12 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
              ${PN}-i915-license ${PN}-i915 \
              ${PN}-ice-license ${PN}-ice \
              ${PN}-ice-enhanced-license ${PN}-ice-enhanced \
-             ${PN}-adsp-sst-license ${PN}-adsp-sst \
+             ${PN}-adsp-sst-license ${PN}-adsp-sst ${PN}-snd-soc-avs \
              ${PN}-bnx2 \
              ${PN}-bnx2x \
              ${PN}-liquidio \
              ${PN}-linaro-license \
-             ${PN}-mali-csffw-arch108 ${PN}-mali-csffw-license \
+             ${PN}-mali-csffw-arch108 ${PN}-mali-csffw-arch1010 ${PN}-mali-csffw-arch1012 ${PN}-mali-csffw-arch118 ${PN}-mali-csffw-arch128 ${PN}-mali-csffw-arch138 ${PN}-mali-csffw-license \
              ${PN}-mellanox \
              ${PN}-nvidia-license \
              ${PN}-nvidia-tegra-k1 ${PN}-nvidia-tegra \
@@ -590,6 +680,7 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
              ${PN}-nxp9098-sdio \
              ${PN}-nxpiw416-sdio \
              ${PN}-nxpiw612-sdio \
+             ${PN}-nxp-sr1xx \
              ${PN}-nxp-mc-license ${PN}-nxp-mc \
              ${PN}-netronome-license ${PN}-netronome \
              ${PN}-olpc-license ${PN}-olpc \
@@ -647,6 +738,82 @@ PACKAGES =+ "${PN}-amphion-vpu-license ${PN}-amphion-vpu \
              ${PN}-xc4000-license ${PN}-xc4000 \
              ${PN}-xc5000-license ${PN}-xc5000 \
              ${PN}-xc5000c-license ${PN}-xc5000c \
+             ${PN}-typhoon-license ${PN}-typhoon \
+             ${PN}-intel-license ${PN}-ish-lnlm \
+             ${PN}-lenovo-license ${PN}-ish-lnlm-53c4ffad-2a17559f \
+             ${PN}-advansys-license ${PN}-advansys \
+             ${PN}-aeonsemi-license ${PN}-as21xxx \
+             ${PN}-agere-license ${PN}-orinoco \
+             ${PN}-airoha-license ${PN}-en8811h ${PN}-airoha-npu \
+             ${PN}-amd-sev-license ${PN}-ccp \
+             ${PN}-amdnpu-license ${PN}-amdxdna \
+             ${PN}-amd-pmf-license ${PN}-amd-pmf \
+             ${PN}-amd-ucode-license ${PN}-microcode-amd \
+             ${PN}-amlogic-license ${PN}-amlogic \
+             ${PN}-abilis-license ${PN}-as102 \
+             ${PN}-starfire \
+             ${PN}-atmel-license ${PN}-wilc1000 ${PN}-wilc3000 \
+             ${PN}-atusb \
+             ${PN}-dvb-ttpci \
+             ${PN}-bmi260-license ${PN}-bmi260 \
+             ${PN}-cadence-license ${PN}-mhdp8546 \
+             ${PN}-cavium-license ${PN}-cnn55xx \
+             ${PN}-bfa-license ${PN}-cbfw ${PN}-ctfw ${PN}-ct2fw \
+             ${PN}-pcnet-cs ${PN}-3c589-cs ${PN}-3c574-cs ${PN}-serial-cs \
+             ${PN}-sw-serial \
+             ${PN}-siano-license ${PN}-smsmdtv \
+             ${PN}-cpia2 \
+             ${PN}-ca0132-license ${PN}-ca0132 \
+             ${PN}-cxgb3-license ${PN}-cxgb3 \
+             ${PN}-chelsio-firmware-license ${PN}-cxgb4 \
+             ${PN}-dabusb-license ${PN}-dabusb \
+             ${PN}-dsp56k \
+             ${PN}-dib0700-license ${PN}-dib0700 \
+             ${PN}-it913x-license ${PN}-it9135 \
+             ${PN}-drxk-license ${PN}-drxk \
+             ${PN}-e100-license ${PN}-e100 \
+             ${PN}-io-ti ${PN}-io-edgeport \
+             ${PN}-emi26-license ${PN}-emi26 \
+             ${PN}-ene-firmware-license ${PN}-ene-ub6250 \
+             ${PN}-snd-maestro3 \
+             ${PN}-go7007-s2250-license ${PN}-go7007-s2250 \
+             ${PN}-go7007-license ${PN}-go7007 \
+             ${PN}-hfi1-license ${PN}-hfi1 \
+             ${PN}-inside-secure-license ${PN}-inside-secure \
+             ${PN}-intcsst2-license ${PN}-snd-soc-catpt \
+             ${PN}-fw-sst-0f28-license ${PN}-snd-intel-sst-core \
+             ${PN}-ivsc-license ${PN}-atomisp ${PN}-intel-ipu6-isys ${PN}-mei-vsc-hw \
+             ${PN}-ipu3-firmware-license ${PN}-ipu3-imgu \
+             ${PN}-intel-ipu7-isys \
+             ${PN}-intel-vpu-license ${PN}-intel-vpu \
+             ${PN}-isci \
+             ${PN}-ixp4xx-license ${PN}-ixp4xx-npe \
+             ${PN}-kaweth-license ${PN}-kaweth \
+             ${PN}-keyspan-license ${PN}-keyspan \
+             ${PN}-keyspan-pda \
+             ${PN}-mga-license ${PN}-mga \
+             ${PN}-myri10ge-firmware-license ${PN}-myri10ge \
+             ${PN}-smc91c92-cs \
+             ${PN}-qla1280-license ${PN}-qla1280 \
+             ${PN}-ib-qib-license ${PN}-ib-qib \
+             ${PN}-r8a779x-usb3-license ${PN}-xhci-rcar \
+             ${PN}-r128 \
+             ${PN}-rt1320-license ${PN}-rt1320 \
+             ${PN}-rp2-license ${PN}-rp2 \
+             ${PN}-s5p-mfc-license ${PN}-s5p-mfc \
+             ${PN}-snd-sb16-csp \
+             ${PN}-alacritech-license ${PN}-slicoss ${PN}-sxg \
+             ${PN}-tehuti-license ${PN}-tehuti \
+             ${PN}-tigon-license ${PN}-tg3 \
+             ${PN}-tlg2300-license ${PN}-tlg2300 \
+             ${PN}-montage-license ${PN}-mont-tsse \
+             ${PN}-ueagle-atm4-firmware-license ${PN}-ueagle-atm \
+             ${PN}-usbdux \
+             ${PN}-conexant-license ${PN}-cx231xx ${PN}-cx23418 ${PN}-cx23885 ${PN}-cx23840 \
+             ${PN}-vxge-license ${PN}-vxge \
+             ${PN}-whiteheat \
+             ${PN}-qualcommatheros-ath10k-license ${PN}-wil6210 \
+             ${PN}-xe-license ${PN}-xe \
              ${PN}-license \
              "
 
@@ -664,7 +831,10 @@ RDEPENDS:${PN}-amphion-vpu += "${PN}-amphion-vpu-license"
 LICENSE:${PN}-cw1200 = "Firmware-cw1200"
 LICENSE:${PN}-cw1200-license = "Firmware-cw1200"
 
-FILES:${PN}-cw1200 = "${nonarch_base_libdir}/firmware/wsm_22.bin*"
+FILES:${PN}-cw1200 = " \
+    ${nonarch_base_libdir}/firmware/sdd_sagrad_1091_1098.bin* \
+    ${nonarch_base_libdir}/firmware/wsm_22.bin* \
+"
 FILES:${PN}-cw1200-license = "${nonarch_base_libdir}/firmware/LICENCE.cw1200"
 
 RDEPENDS:${PN}-cw1200 += "${PN}-cw1200-license"
@@ -1136,12 +1306,32 @@ FILES:${PN}-lontium-license = "${nonarch_base_libdir}/firmware/LICENSE.Lontium"
 FILES:${PN}-lt9611uxc = "${nonarch_base_libdir}/firmware/lt9611uxc_fw.bin*"
 
 # For Arm Mali
-LICENSE:${PN}-mali-csffw-arch108 = "Firmware-mali_csffw"
 FILES:${PN}-mali-csffw-license = "${nonarch_base_libdir}/firmware/LICENCE.mali_csffw"
-FILES:${PN}-mali-csffw-arch108 = "${nonarch_base_libdir}/firmware/arm/mali/arch10.8/mali_csffw.bin*"
 
+LICENSE:${PN}-mali-csffw-arch108 = "Firmware-mali_csffw"
+FILES:${PN}-mali-csffw-arch108 = "${nonarch_base_libdir}/firmware/arm/mali/arch10.8/mali_csffw.bin*"
 RDEPENDS:${PN}-mali-csffw-arch108 += "${PN}-mali-csffw-license"
 
+LICENSE:${PN}-mali-csffw-arch1010 = "Firmware-mali_csffw"
+FILES:${PN}-mali-csffw-arch1010 = "${nonarch_base_libdir}/firmware/arm/mali/arch10.10/mali_csffw.bin*"
+RDEPENDS:${PN}-mali-csffw-arch1010 += "${PN}-mali-csffw-license"
+
+LICENSE:${PN}-mali-csffw-arch1012 = "Firmware-mali_csffw"
+FILES:${PN}-mali-csffw-arch1012 = "${nonarch_base_libdir}/firmware/arm/mali/arch10.12/mali_csffw.bin*"
+RDEPENDS:${PN}-mali-csffw-arch1012 += "${PN}-mali-csffw-license"
+
+LICENSE:${PN}-mali-csffw-arch118 = "Firmware-mali_csffw"
+FILES:${PN}-mali-csffw-arch118 = "${nonarch_base_libdir}/firmware/arm/mali/arch11.8/mali_csffw.bin*"
+RDEPENDS:${PN}-mali-csffw-arch118 += "${PN}-mali-csffw-license"
+
+LICENSE:${PN}-mali-csffw-arch128 = "Firmware-mali_csffw"
+FILES:${PN}-mali-csffw-arch128 = "${nonarch_base_libdir}/firmware/arm/mali/arch12.8/mali_csffw.bin*"
+RDEPENDS:${PN}-mali-csffw-arch128 += "${PN}-mali-csffw-license"
+
+LICENSE:${PN}-mali-csffw-arch138 = "Firmware-mali_csffw"
+FILES:${PN}-mali-csffw-arch138 = "${nonarch_base_libdir}/firmware/arm/mali/arch13.8/mali_csffw.bin*"
+RDEPENDS:${PN}-mali-csffw-arch138 += "${PN}-mali-csffw-license"
+
 # For marvell
 LICENSE:${PN}-pcie8897 = "Firmware-Marvell"
 LICENSE:${PN}-pcie8997 = "Firmware-Marvell"
@@ -1154,6 +1344,23 @@ LICENSE:${PN}-sd8887 = "Firmware-Marvell"
 LICENSE:${PN}-sd8897 = "Firmware-Marvell"
 LICENSE:${PN}-sd8997 = "Firmware-Marvell"
 LICENSE:${PN}-usb8997 = "Firmware-Marvell"
+LICENSE:${PN}-cf8381 = "Firmware-Marvell"
+LICENSE:${PN}-cf8385 = "Firmware-Marvell"
+LICENSE:${PN}-gspi8682 = "Firmware-Marvell"
+LICENSE:${PN}-gspi8686 = "Firmware-Marvell"
+LICENSE:${PN}-gspi8688 = "Firmware-Marvell"
+LICENSE:${PN}-sd8385 = "Firmware-Marvell"
+LICENSE:${PN}-sd8682 = "Firmware-Marvell"
+LICENSE:${PN}-usb8388 = "Firmware-Marvell"
+LICENSE:${PN}-usb8682 = "Firmware-Marvell"
+LICENSE:${PN}-sd8977 = "Firmware-Marvell"
+LICENSE:${PN}-usb8766 = "Firmware-Marvell"
+LICENSE:${PN}-usb8797 = "Firmware-Marvell"
+LICENSE:${PN}-usb8801 = "Firmware-Marvell"
+LICENSE:${PN}-usb8897 = "Firmware-Marvell"
+LICENSE:${PN}-rvu-cptpf = "Firmware-Marvell"
+LICENSE:${PN}-mwl8k = "Firmware-Marvell"
+LICENSE:${PN}-mwlwifi = "Firmware-Marvell"
 LICENSE:${PN}-marvell-license = "Firmware-Marvell"
 
 FILES:${PN}-marvell-license = "${nonarch_base_libdir}/firmware/LICENCE.Marvell"
@@ -1166,8 +1373,7 @@ FILES:${PN}-pcie8997 = " \
   ${nonarch_base_libdir}/firmware/mrvl/pcieusb8997_combo_v4.bin* \
 "
 FILES:${PN}-sd8686 = " \
-  ${nonarch_base_libdir}/firmware/libertas/sd8686_v9* \
-  ${nonarch_base_libdir}/firmware/sd8686* \
+  ${nonarch_base_libdir}/firmware/libertas/sd8686* \
 "
 FILES:${PN}-sd8688 = " \
   ${nonarch_base_libdir}/firmware/libertas/sd8688* \
@@ -1204,6 +1410,23 @@ FILES:${PN}-sd8997 = " \
 FILES:${PN}-usb8997 = " \
   ${nonarch_base_libdir}/firmware/mrvl/usbusb8997_combo_v4.bin* \
 "
+FILES:${PN}-cf8381 = "${nonarch_base_libdir}/firmware/libertas/cf8381*"
+FILES:${PN}-cf8385 = "${nonarch_base_libdir}/firmware/libertas/cf8385*"
+FILES:${PN}-gspi8682 = "${nonarch_base_libdir}/firmware/libertas/gspi8682*"
+FILES:${PN}-gspi8686 = "${nonarch_base_libdir}/firmware/libertas/gspi8686*"
+FILES:${PN}-gspi8688 = "${nonarch_base_libdir}/firmware/libertas/gspi8688*"
+FILES:${PN}-sd8385 = "${nonarch_base_libdir}/firmware/libertas/sd8385*"
+FILES:${PN}-sd8682 = "${nonarch_base_libdir}/firmware/libertas/sd8682*"
+FILES:${PN}-usb8388 = "${nonarch_base_libdir}/firmware/libertas/usb8388*"
+FILES:${PN}-usb8682 = "${nonarch_base_libdir}/firmware/libertas/usb8682*"
+FILES:${PN}-sd8977 = "${nonarch_base_libdir}/firmware/mrvl/sdsd8977*"
+FILES:${PN}-usb8766 = "${nonarch_base_libdir}/firmware/mrvl/usb8766*"
+FILES:${PN}-usb8797 = "${nonarch_base_libdir}/firmware/mrvl/usb8797*"
+FILES:${PN}-usb8801 = "${nonarch_base_libdir}/firmware/mrvl/usb8801*"
+FILES:${PN}-usb8897 = "${nonarch_base_libdir}/firmware/mrvl/usb8897*"
+FILES:${PN}-rvu-cptpf = "${nonarch_base_libdir}/firmware/mrvl/cpt0*"
+FILES:${PN}-mwl8k = "${nonarch_base_libdir}/firmware/mwl8k/*"
+FILES:${PN}-mwlwifi = "${nonarch_base_libdir}/firmware/mwlwifi/*"
 
 RDEPENDS:${PN}-sd8686 += "${PN}-marvell-license"
 RDEPENDS:${PN}-sd8688 += "${PN}-marvell-license"
@@ -1214,6 +1437,23 @@ RDEPENDS:${PN}-sd8887 += "${PN}-marvell-license"
 RDEPENDS:${PN}-sd8897 += "${PN}-marvell-license"
 RDEPENDS:${PN}-sd8997 += "${PN}-marvell-license"
 RDEPENDS:${PN}-usb8997 += "${PN}-marvell-license"
+RDEPENDS:${PN}-cf8381 += "${PN}-marvell-license"
+RDEPENDS:${PN}-cf8385 += "${PN}-marvell-license"
+RDEPENDS:${PN}-gspi8682 += "${PN}-marvell-license"
+RDEPENDS:${PN}-gspi8686 += "${PN}-marvell-license"
+RDEPENDS:${PN}-gspi8688 += "${PN}-marvell-license"
+RDEPENDS:${PN}-sd8385 += "${PN}-marvell-license"
+RDEPENDS:${PN}-sd8682 += "${PN}-marvell-license"
+RDEPENDS:${PN}-usb8388 += "${PN}-marvell-license"
+RDEPENDS:${PN}-usb8682 += "${PN}-marvell-license"
+RDEPENDS:${PN}-sd8977 += "${PN}-marvell-license"
+RDEPENDS:${PN}-usb8766 += "${PN}-marvell-license"
+RDEPENDS:${PN}-usb8797 += "${PN}-marvell-license"
+RDEPENDS:${PN}-usb8801 += "${PN}-marvell-license"
+RDEPENDS:${PN}-usb8897 += "${PN}-marvell-license"
+RDEPENDS:${PN}-rvu-cptpf += "${PN}-marvell-license"
+RDEPENDS:${PN}-mwl8k += "${PN}-marvell-license"
+RDEPENDS:${PN}-mwlwifi += "${PN}-marvell-license"
 
 # For netronome
 LICENSE:${PN}-netronome = "Firmware-netronome"
@@ -1247,6 +1487,7 @@ LICENSE:${PN}-nxp9098-pcie = "Firmware-nxp"
 LICENSE:${PN}-nxp9098-sdio = "Firmware-nxp"
 LICENSE:${PN}-nxpiw416-sdio = "Firmware-nxp"
 LICENSE:${PN}-nxpiw612-sdio = "Firmware-nxp"
+LICENSE:${PN}-nxp-sr1xx = "Firmware-nxp"
 LICENSE:${PN}-nxp-license = "Firmware-nxp"
 
 FILES:${PN}-nxp8987-sdio = "${nonarch_base_libdir}/firmware/nxp/*8987*"
@@ -1261,6 +1502,7 @@ ALLOW_EMPTY:${PN}-nxp9098-pcie = "1"
 ALLOW_EMPTY:${PN}-nxp9098-sdio = "1"
 FILES:${PN}-nxpiw416-sdio = "${nonarch_base_libdir}/firmware/nxp/*iw416*"
 FILES:${PN}-nxpiw612-sdio = "${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_v1.bin.se*"
+FILES:${PN}-nxp-sr1xx = "${nonarch_base_libdir}/firmware/nxp/sr150_fw.bin"
 FILES:${PN}-nxp-license = "${nonarch_base_libdir}/firmware/LICENSE.nxp"
 
 RDEPENDS:${PN}-nxp8987-sdio += "${PN}-nxp-license"
@@ -1272,6 +1514,7 @@ RDEPENDS:${PN}-nxp9098-pcie += "${PN}-nxp9098-common"
 RDEPENDS:${PN}-nxp9098-sdio += "${PN}-nxp9098-common"
 RDEPENDS:${PN}-nxpiw416-sdio += "${PN}-nxp-license"
 RDEPENDS:${PN}-nxpiw612-sdio += "${PN}-nxp-license"
+RDEPENDS:${PN}-nxp-sr1xx += "${PN}-nxp-license"
 
 # For nxp-mc
 LICENSE:${PN}-nxp-mc = "Firmware-nxp_mc_firmware"
@@ -1348,12 +1591,15 @@ RDEPENDS:${PN}-qla2xxx += "${PN}-qla2xxx-license"
 # For RSI RS911x WiFi
 LICENSE:${PN}-rs9113 = "WHENCE"
 LICENSE:${PN}-rs9116 = "WHENCE"
+LICENSE:${PN}-rsi-91x = "WHENCE"
 
 FILES:${PN}-rs9113 = " ${nonarch_base_libdir}/firmware/rsi/rs9113*.rps* "
 FILES:${PN}-rs9116 = " ${nonarch_base_libdir}/firmware/rsi/rs9116*.rps* "
+FILES:${PN}-rsi-91x = " ${nonarch_base_libdir}/firmware/rsi_91x.fw "
 
 RDEPENDS:${PN}-rs9113 += "${PN}-whence-license"
 RDEPENDS:${PN}-rs9116 += "${PN}-whence-license"
+RDEPENDS:${PN}-rsi-91x += "${PN}-whence-license"
 
 # For rtl
 LICENSE:${PN}-rtl8188 = "Firmware-rtlwifi_firmware"
@@ -1364,6 +1610,14 @@ LICENSE:${PN}-rtl8723 = "Firmware-rtlwifi_firmware"
 LICENSE:${PN}-rtl8761 = "Firmware-rtlwifi_firmware"
 LICENSE:${PN}-rtl8821 = "Firmware-rtlwifi_firmware"
 LICENSE:${PN}-rtl8822 = "Firmware-rtlwifi_firmware"
+LICENSE:${PN}-rtl8192 = "Firmware-rtlwifi_firmware"
+LICENSE:${PN}-rtl8710 = "Firmware-rtlwifi_firmware"
+LICENSE:${PN}-rtl8812 = "Firmware-rtlwifi_firmware"
+LICENSE:${PN}-rtl8851 = "Firmware-rtlwifi_firmware"
+LICENSE:${PN}-rtl8852 = "Firmware-rtlwifi_firmware"
+LICENSE:${PN}-rtl8922 = "Firmware-rtlwifi_firmware"
+LICENSE:${PN}-rtl8703 = "Firmware-rtlwifi_firmware"
+LICENSE:${PN}-rtl8814 = "Firmware-rtlwifi_firmware"
 LICENSE:${PN}-rtl-license = "Firmware-rtlwifi_firmware"
 LICENSE:${PN}-rtl-nic = "WHENCE"
 LICENSE:${PN}-rtl8168 = "WHENCE"
@@ -1390,6 +1644,7 @@ FILES:${PN}-rtl8723 = " \
 "
 FILES:${PN}-rtl8821 = " \
   ${nonarch_base_libdir}/firmware/rtlwifi/rtl8821*.bin* \
+  ${nonarch_base_libdir}/firmware/rtw88/README \
   ${nonarch_base_libdir}/firmware/rtw88/rtw8821*.bin* \
   ${nonarch_base_libdir}/firmware/rtl_bt/rtl8821*.bin \
 "
@@ -1407,6 +1662,30 @@ FILES:${PN}-rtl8822 = " \
 FILES:${PN}-rtl-nic = " \
   ${nonarch_base_libdir}/firmware/rtl_nic/*.fw* \
 "
+FILES:${PN}-rtl8192 = " \
+    ${nonarch_base_libdir}/firmware/rtlwifi/rtl8192* \
+    ${nonarch_base_libdir}/firmware/rtl_bt/rtl8192* \
+"
+FILES:${PN}-rtl8710 = "${nonarch_base_libdir}/firmware/rtlwifi/rtl8710*"
+FILES:${PN}-rtl8812 = " \
+    ${nonarch_base_libdir}/firmware/rtlwifi/rtl8812* \
+    ${nonarch_base_libdir}/firmware/rtl_bt/rtl8812* \
+    ${nonarch_base_libdir}/firmware/rtw88/rtw8812* \
+"
+FILES:${PN}-rtl8851 = " \
+    ${nonarch_base_libdir}/firmware/rtl_bt/rtl8851* \
+    ${nonarch_base_libdir}/firmware/rtw89/rtw8851* \
+"
+FILES:${PN}-rtl8852 = " \
+    ${nonarch_base_libdir}/firmware/rtl_bt/rtl8852* \
+    ${nonarch_base_libdir}/firmware/rtw89/rtw8852* \
+"
+FILES:${PN}-rtl8922 = " \
+    ${nonarch_base_libdir}/firmware/rtl_bt/rtl8922* \
+    ${nonarch_base_libdir}/firmware/rtw89/rtw8922* \
+"
+FILES:${PN}-rtl8703 = "${nonarch_base_libdir}/firmware/rtw88/rtw8703*"
+FILES:${PN}-rtl8814 = "${nonarch_base_libdir}/firmware/rtw88/rtw8814*"
 
 RDEPENDS:${PN}-rtl8188 += "${PN}-rtl-license"
 RDEPENDS:${PN}-rtl8192ce += "${PN}-rtl-license"
@@ -1416,6 +1695,14 @@ RDEPENDS:${PN}-rtl8723 += "${PN}-rtl-license"
 RDEPENDS:${PN}-rtl8821 += "${PN}-rtl-license"
 RDEPENDS:${PN}-rtl8761 += "${PN}-rtl-license"
 RDEPENDS:${PN}-rtl8822 += "${PN}-rtl-license"
+RDEPENDS:${PN}-rtl8192 += "${PN}-rtl-license"
+RDEPENDS:${PN}-rtl8710 += "${PN}-rtl-license"
+RDEPENDS:${PN}-rtl8812 += "${PN}-rtl-license"
+RDEPENDS:${PN}-rtl8851 += "${PN}-rtl-license"
+RDEPENDS:${PN}-rtl8852 += "${PN}-rtl-license"
+RDEPENDS:${PN}-rtl8922 += "${PN}-rtl-license"
+RDEPENDS:${PN}-rtl8703 += "${PN}-rtl-license"
+RDEPENDS:${PN}-rtl8814 += "${PN}-rtl-license"
 RDEPENDS:${PN}-rtl8168 += "${PN}-whence-license"
 RDEPENDS:${PN}-rtl-nic += "${PN}-whence-license"
 
@@ -1488,6 +1775,41 @@ FILES:${PN}-ti-keystone-license = " \
 "
 RDEPENDS:${PN}-ti-keystone += "${PN}-ti-keystone-license"
 
+# For ti-tspa-license
+LICENSE:${PN}-ti-tspa-license = "Firmware-ti-tspa"
+FILES:${PN}-ti-tspa-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-tspa"
+
+# For ti-tas2563 - tas2563 firmware
+LICENSE:${PN}-ti-tas2563 = "Firmware-ti-tspa"
+FILES:${PN}-ti-tas2563 = "\
+    ${nonarch_base_libdir}/firmware/INT8866RCA2.bin \
+    ${nonarch_base_libdir}/firmware/TAS2XXX3870.bin \
+    ${nonarch_base_libdir}/firmware/ti/tas2563/* \
+"
+RDEPENDS:${PN}-ti-tas2563 = "${PN}-ti-tspa-license"
+
+# For ti-tas2781 - tas2781 firmware
+LICENSE:${PN}-ti-tas2781 = "Firmware-ti-tspa"
+FILES:${PN}-ti-tas2781 = "\
+    ${nonarch_base_libdir}/firmware/TAS2XXX*.bin \
+    ${nonarch_base_libdir}/firmware/TIAS2781*.bin \
+    ${nonarch_base_libdir}/firmware/TXNW2781*.bin \
+    ${nonarch_base_libdir}/firmware/ti/tas2781/* \
+"
+RDEPENDS:${PN}-ti-tas2781 = "${PN}-ti-tspa-license"
+
+# For ti-vpe - Texas Instruments V4L2 driver for Video Processing Engine
+LICENSE:${PN}-ti-vpe = "Firmware-ti-tspa"
+FILES:${PN}-ti-vpe = "${nonarch_base_libdir}/firmware/ti/vpdma-1b8.bin"
+RDEPENDS:${PN}-ti-vpe = "${PN}-ti-tspa-license"
+
+# For ti_usb_3410_5052 - USB TI 3410/5052 serial device
+LICENSE:${PN}-ti-usb-3410-5052 = "GPL-2.0-or-later"
+FILES:${PN}-ti-usb-3410-5052 = "\
+    ${nonarch_base_libdir}/firmware/ti_3410.fw \
+    ${nonarch_base_libdir}/firmware/ti_5052.fw \
+"
+
 # For vt6656
 LICENSE:${PN}-vt6656 = "Firmware-via_vt6656"
 LICENSE:${PN}-vt6656-license = "Firmware-via_vt6656"
@@ -1549,9 +1871,12 @@ FILES:${PN}-bcm4339 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4339-sdio.bi
   ${nonarch_base_libdir}/firmware/cypress/cyfmac4339-sdio.bin* \
 "
 FILES:${PN}-bcm43241b0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b0-sdio.bin*"
-FILES:${PN}-bcm43241b4 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b4-sdio.bin*"
+FILES:${PN}-bcm43241b4 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b4-sdio.*"
 FILES:${PN}-bcm43241b5 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b5-sdio.bin*"
 FILES:${PN}-bcm43242a = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43242a.bin*"
+FILES:${PN}-bcm43012 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43012-sdio.* \
+  ${nonarch_base_libdir}/firmware/cypress/cyfmac43012-sdio.* \
+"
 FILES:${PN}-bcm43143 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43143.bin* \
   ${nonarch_base_libdir}/firmware/brcm/brcmfmac43143-sdio.bin* \
 "
@@ -1565,8 +1890,8 @@ FILES:${PN}-bcm4356 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-sdio.*
   ${nonarch_base_libdir}/firmware/cypress/cyfmac4356-sdio.* \
 "
 FILES:${PN}-bcm43569 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43569.bin*"
-FILES:${PN}-bcm43570 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43570-pcie.bin* \
-  ${nonarch_base_libdir}/firmware/cypress/cyfmac43570-pcie.bin* \
+FILES:${PN}-bcm43570 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43570-pcie.* \
+  ${nonarch_base_libdir}/firmware/cypress/cyfmac43570-pcie.* \
 "
 FILES:${PN}-bcm4358 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4358-pcie.bin*"
 FILES:${PN}-bcm43602 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.bin* \
@@ -1576,6 +1901,10 @@ FILES:${PN}-bcm4366b = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4366b-pcie.
 FILES:${PN}-bcm4366c = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4366c-pcie.bin*"
 FILES:${PN}-bcm4371 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4371-pcie.bin*"
 
+FILES:${PN}-bcm54591 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac54591-pcie.* \
+  ${nonarch_base_libdir}/firmware/cypress/cyfmac54591-pcie.* \
+"
+
 # for i in `grep brcm WHENCE  | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo -e "LICENSE:\${PN}-$pkg = \"Firmware-broadcom_bcm43xx\"\nRDEPENDS_\${PN}-$pkg += \"\${PN}-broadcom-license\""; done
 # Currently 1st one and last 6 have cypress LICENSE
 
@@ -1605,6 +1934,8 @@ LICENSE:${PN}-bcm43241b5 = "Firmware-broadcom_bcm43xx"
 RDEPENDS:${PN}-bcm43241b5 += "${PN}-broadcom-license"
 LICENSE:${PN}-bcm43242a = "Firmware-broadcom_bcm43xx"
 RDEPENDS:${PN}-bcm43242a += "${PN}-broadcom-license"
+LICENSE:${PN}-bcm43012 = "Firmware-broadcom_bcm43xx"
+RDEPENDS:${PN}-bcm43012 += "${PN}-broadcom-license"
 LICENSE:${PN}-bcm43143 = "Firmware-broadcom_bcm43xx"
 RDEPENDS:${PN}-bcm43143 += "${PN}-broadcom-license"
 LICENSE:${PN}-bcm43430a0 = "Firmware-broadcom_bcm43xx"
@@ -1631,6 +1962,8 @@ LICENSE:${PN}-bcm4366c = "Firmware-broadcom_bcm43xx"
 RDEPENDS:${PN}-bcm4366c += "${PN}-broadcom-license"
 LICENSE:${PN}-bcm4371 = "Firmware-broadcom_bcm43xx"
 RDEPENDS:${PN}-bcm4371 += "${PN}-broadcom-license"
+LICENSE:${PN}-bcm54591 = "Firmware-broadcom_bcm43xx"
+RDEPENDS:${PN}-bcm54591 += "${PN}-broadcom-license"
 
 # For broadcom cypress
 
@@ -1638,14 +1971,15 @@ LICENSE:${PN}-cypress-license = "Firmware-cypress"
 FILES:${PN}-cypress-license = "${nonarch_base_libdir}/firmware/LICENCE.cypress"
 
 FILES:${PN}-bcm-0bb4-0306 = "${nonarch_base_libdir}/firmware/brcm/BCM-0bb4-0306.hcd*"
+FILES:${PN}-bcm-0a5c-6410 = "${nonarch_base_libdir}/firmware/brcm/BCM-0a5c-6410.hcd*"
 FILES:${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.* \
   ${nonarch_base_libdir}/firmware/cypress/cyfmac43340-sdio.*"
 FILES:${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.* \
   ${nonarch_base_libdir}/firmware/cypress/cyfmac43362-sdio.*"
 FILES:${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.* \
   ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.*"
-FILES:${PN}-bcm4354 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4354-sdio.bin* \
-  ${nonarch_base_libdir}/firmware/cypress/cyfmac4354-sdio.bin* \
+FILES:${PN}-bcm4354 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4354-sdio.* \
+  ${nonarch_base_libdir}/firmware/cypress/cyfmac4354-sdio.* \
 "
 FILES:${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.* \
   ${nonarch_base_libdir}/firmware/cypress/cyfmac4356-pcie.* \
@@ -1659,6 +1993,8 @@ FILES:${PN}-bcm4373 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.bi
 
 LICENSE:${PN}-bcm-0bb4-0306 = "Firmware-cypress"
 RDEPENDS:${PN}-bcm-0bb4-0306 += "${PN}-cypress-license"
+LICENSE:${PN}-bcm-0a5c-6410 = "Firmware-cypress"
+RDEPENDS:${PN}-bcm-0a5c-6410 += "${PN}-bcm-0bb4-0306"
 LICENSE:${PN}-bcm43340 = "Firmware-cypress"
 RDEPENDS:${PN}-bcm43340 += "${PN}-cypress-license"
 LICENSE:${PN}-bcm43362 = "Firmware-cypress"
@@ -1699,7 +2035,10 @@ RDEPENDS:${PN}-bnx2x += "${PN}-whence-license"
 LICENSE:${PN}-cirrus = "Firmware-cirrus"
 LICENSE:${PN}-cirrus-license = "Firmware-cirrus"
 
-FILES:${PN}-cirrus = "${nonarch_base_libdir}/firmware/cirrus/*"
+FILES:${PN}-cirrus = " \
+    ${nonarch_base_libdir}/firmware/cs42l43.bin \
+    ${nonarch_base_libdir}/firmware/cirrus/* \
+"
 FILES:${PN}-cirrus-license = "${nonarch_base_libdir}/firmware/LICENSE.cirrus"
 
 RDEPENDS:${PN}-cirrus += "${PN}-cirrus-license"
@@ -1708,7 +2047,7 @@ RDEPENDS:${PN}-cirrus += "${PN}-cirrus-license"
 LICENSE:${PN}-cnm = "Firmware-cnm"
 LICENSE:${PN}-cnm-license = "Firmware-cnm"
 
-FILES:${PN}-cnm = "${nonarch_base_libdir}/firmware/cnm/wave521c_k3_codec_fw.bin*"
+FILES:${PN}-cnm = "${nonarch_base_libdir}/firmware/cnm/*"
 FILES:${PN}-cnm-license = "${nonarch_base_libdir}/firmware/LICENCE.cnm"
 
 RDEPENDS:${PN}-cnm += "${PN}-cnm-license"
@@ -1897,9 +2236,14 @@ LICENSE:${PN}-adsp-sst-license    = "Firmware-adsp_sst"
 FILES:${PN}-adsp-sst              = "\
     ${nonarch_base_libdir}/firmware/intel/dsp_fw* \
     ${nonarch_base_libdir}/firmware/intel/avs/*/dsp_basefw.bin \
+    ${nonarch_base_libdir}/firmware/intel/avs/skl/dsp_mod_7CAD0808-AB10-CD23-EF45-12AB34CD56EF.bin \
 "
 RDEPENDS:${PN}-adsp-sst           = "${PN}-adsp-sst-license"
 
+# For snd_soc_avs - Intel AudioDSP driver for cAVS platforms
+LICENSE:${PN}-snd-soc-avs = "Apache-2.0"
+FILES:${PN}-snd-soc-avs = "${nonarch_base_libdir}/firmware/intel/avs/*"
+
 # For QAT
 LICENSE:${PN}-qat         = "Firmware-qat"
 LICENSE:${PN}-qat-license = "Firmware-qat"
@@ -2061,7 +2405,11 @@ FILES:${PN}-qcom-qrb4210-compute = "${nonarch_base_libdir}/firmware/qcom/qrb4210
 FILES:${PN}-qcom-qrb4210-modem = "${nonarch_base_libdir}/firmware/qcom/qrb4210/modem*.*"
 FILES:${PN}-qcom-qrb4210-wifi = "${nonarch_base_libdir}/firmware/qcom/qrb4210/wlanmdsp.mbn* ${nonarch_base_libdir}/firmware/ath10k/WCN3990/hw1.0/qrb4210/*"
 FILES:${PN}-qcom-sa8775p-adreno = "${nonarch_base_libdir}/firmware/qcom/sa8775p/a663_zap.mbn*"
-FILES:${PN}-qcom-sa8775p-audio = "${nonarch_base_libdir}/firmware/qcom/sa8775p/adsp*.* ${nonarch_base_libdir}/firmware/qcom/qcs9100/LEMANS-EVK-tplg.bin*"
+FILES:${PN}-qcom-sa8775p-audio = "\
+    ${nonarch_base_libdir}/firmware/qcom/sa8775p/adsp*.* \
+    ${nonarch_base_libdir}/firmware/qcom/sa8775p/LEMANS-EVK-tplg.bin \
+    ${nonarch_base_libdir}/firmware/qcom/qcs9100/LEMANS-EVK-tplg.bin \
+"
 FILES:${PN}-qcom-sa8775p-compute = "${nonarch_base_libdir}/firmware/qcom/sa8775p/cdsp*.*"
 FILES:${PN}-qcom-sa8775p-generalpurpose = "${nonarch_base_libdir}/firmware/qcom/sa8775p/gpdsp*.*"
 FILES:${PN}-qcom-sa8775p-qupv3fw = "${nonarch_base_libdir}/firmware/qcom/sa8775p/qupv3fw.elf*"
@@ -2217,6 +2565,656 @@ FILES:${PN}-amlogic-vdec-license = "${nonarch_base_libdir}/firmware/LICENSE.amlo
 FILES:${PN}-amlogic-vdec = "${nonarch_base_libdir}/firmware/meson/vdec/*"
 RDEPENDS:${PN}-amlogic-vdec = "${PN}-amlogic-vdec-license"
 
+# For 3com typhoon
+LICENSE:${PN}-typhoon-license = "Firmware-typhoon"
+LICENSE:${PN}-typhoon = "Firmware-typhoon"
+FILES:${PN}-typhoon-license = "${nonarch_base_libdir}/firmware/LICENCE.typhoon"
+FILES:${PN}-typhoon = "${nonarch_base_libdir}/firmware/3com/typhoon.bin"
+RDEPENDS:${PN}-typhoon = "${PN}-typhoon-license"
+
+# For ish - Intel Integrated Sensor Hub
+LICENSE:${PN}-intel-license = "Firmware-intel"
+FILES:${PN}-intel-license = "${nonarch_base_libdir}/firmware/LICENSE.intel"
+
+LICENSE:${PN}-ish-lnlm = "Firmware-intel"
+FILES:${PN}-ish-lnlm = "${nonarch_base_libdir}/firmware/intel/ish/ish_lnlm.bin"
+RDEPENDS:${PN}-ish-lnlm = "${PN}-intel-license"
+
+# For LENOVO ish - Intel Integrated Sensor Hub
+LICENSE:${PN}-lenovo-license = "Firmware-lenovo"
+FILES:${PN}-lenovo-license = "${nonarch_base_libdir}/firmware/LICENCE.lenovo"
+
+LICENSE:${PN}-ish-lnlm-53c4ffad-2a17559f = "Firmware-lenovo"
+FILES:${PN}-ish-lnlm-53c4ffad-2a17559f = "\
+    ${nonarch_base_libdir}/firmware/LENOVO/ish/ish_lnlm_53c4ffad_2a17559f.bin \
+    ${nonarch_base_libdir}/firmware/intel/ish/ish_lnlm_53c4ffad_2a17559f.bin \
+"
+RDEPENDS:${PN}-ish-lnlm-53c4ffad-2a17559f = "${PN}-lenovo-license"
+
+# For advansys - AdvanSys SCSI
+LICENSE:${PN}-advansys-license = "Firmware-advansys"
+FILES:${PN}-advansys-license = "${nonarch_base_libdir}/firmware/LICENCE.advansys"
+
+LICENSE:${PN}-advansys = "Firmware-advansys"
+FILES:${PN}-advansys = "${nonarch_base_libdir}/firmware/advansys/*"
+RDEPENDS:${PN}-advansys = "${PN}-advansys-license"
+
+# For as21xxx
+LICENSE:${PN}-aeonsemi-license = "Firmware-aeonsemi"
+FILES:${PN}-aeonsemi-license = "${nonarch_base_libdir}/firmware/LICENSE.aeonsemi"
+
+LICENSE:${PN}-as21xxx = "Firmware-aeonsemi"
+FILES:${PN}-as21xxx = "${nonarch_base_libdir}/firmware/aeonsemi/*"
+RDEPENDS:${PN}-as21xxx = "${PN}-aeonsemi-license"
+
+# For orinoco - Agere/Prism/Symbol Orinoco support
+LICENSE:${PN}-agere-license = "Firmware-agere"
+FILES:${PN}-agere-license = "${nonarch_base_libdir}/firmware/LICENCE.agere"
+
+LICENSE:${PN}-orinoco = "Firmware-agere"
+FILES:${PN}-orinoco = "${nonarch_base_libdir}/firmware/agere_*"
+RDEPENDS:${PN}-orinoco = "${PN}-agere-license"
+
+# For en8811h - Airoha 2.5G Ethernet Phy
+LICENSE:${PN}-airoha-license = "Firmware-airoha"
+FILES:${PN}-airoha-license = "${nonarch_base_libdir}/firmware/LICENSE.airoha"
+
+LICENSE:${PN}-en8811h = "Firmware-airoha"
+FILES:${PN}-en8811h = "${nonarch_base_libdir}/firmware/airoha/EthMD32*"
+RDEPENDS:${PN}-en8811h = "${PN}-airoha-license"
+
+# For airoha-npu - Airoha Network Processor Unit driver
+LICENSE:${PN}-airoha-npu = "Firmware-airoha"
+FILES:${PN}-airoha-npu = "${nonarch_base_libdir}/firmware/airoha/en7581_npu*"
+RDEPENDS:${PN}-airoha-npu = "${PN}-airoha-license"
+
+# For ccp - Platform Security Processor (PSP) device
+LICENSE:${PN}-amd-sev-license = "Firmware-amd-sev"
+FILES:${PN}-amd-sev-license = "${nonarch_base_libdir}/firmware/LICENSE.amd-sev"
+
+LICENSE:${PN}-ccp = "Firmware-amd-sev"
+FILES:${PN}-ccp = "${nonarch_base_libdir}/firmware/amd/amd_sev*"
+RDEPENDS:${PN}-ccp = "${PN}-amd-sev-license"
+
+# For amdxdna - AMD Inference processor
+LICENSE:${PN}-amdnpu-license = "Firmware-amdnpu"
+FILES:${PN}-amdnpu-license = "${nonarch_base_libdir}/firmware/LICENSE.amdnpu"
+
+LICENSE:${PN}-amdxdna = "Firmware-amdnpu"
+FILES:${PN}-amdxdna = "${nonarch_base_libdir}/firmware/amdnpu/*"
+RDEPENDS:${PN}-amdxdna = "${PN}-amdnpu-license"
+
+# For amd_pmf - AMD Platform Management Framework TA
+LICENSE:${PN}-amd-pmf-license = "Firmware-amd_pmf"
+FILES:${PN}-amd-pmf-license = "${nonarch_base_libdir}/firmware/LICENSE.amd_pmf"
+
+LICENSE:${PN}-amd-pmf = "Firmware-amd_pmf"
+FILES:${PN}-amd-pmf = "${nonarch_base_libdir}/firmware/amdtee/*"
+RDEPENDS:${PN}-amd-pmf = "${PN}-amd-pmf-license"
+
+# For microcode_amd - AMD CPU Microcode Update Driver for Linux
+LICENSE:${PN}-amd-ucode-license = "Firmware-amd-ucode"
+FILES:${PN}-amd-ucode-license = "${nonarch_base_libdir}/firmware/LICENSE.amd-ucode"
+
+LICENSE:${PN}-microcode-amd = "Firmware-amd-ucode"
+FILES:${PN}-microcode-amd = "${nonarch_base_libdir}/firmware/amd-ucode/*"
+RDEPENDS:${PN}-microcode-amd = "${PN}-amd-ucode-license"
+
+# For amlogic - Amlogic SoC Firmware
+LICENSE:${PN}-amlogic-license = "Firmware-amlogic"
+FILES:${PN}-amlogic-license = "${nonarch_base_libdir}/firmware/LICENSE.amlogic"
+
+LICENSE:${PN}-amlogic = "Firmware-amlogic"
+FILES:${PN}-amlogic = "${nonarch_base_libdir}/firmware/amlogic/aml_*"
+RDEPENDS:${PN}-amlogic = "${PN}-amlogic-license"
+
+# For starfire - Adaptec Starfire/DuraLAN support
+LICENSE:${PN}-starfire = "GPL-2.0-only"
+FILES:${PN}-starfire = "${nonarch_base_libdir}/firmware/adaptec/starfire*"
+
+# For as102 - Abilis Systems Single DVB-T Receiver
+LICENSE:${PN}-abilis-license = "Firmware-Abilis"
+FILES:${PN}-abilis-license = "${nonarch_base_libdir}/firmware/LICENCE.Abilis"
+
+LICENSE:${PN}-as102 = "Firmware-Abilis"
+FILES:${PN}-as102 = "${nonarch_base_libdir}/firmware/as102_data*_st.hex"
+RDEPENDS:${PN}-as102 = "${PN}-abilis-license"
+
+# For wilc1000 - Atmel 802.11n WLAN driver for WILC1000 & WILC3000
+LICENSE:${PN}-atmel-license = "Firmware-atmel"
+FILES:${PN}-atmel-license = "${nonarch_base_libdir}/firmware/LICENSE.atmel"
+
+LICENSE:${PN}-wilc1000 = "Firmware-atmel"
+FILES:${PN}-wilc1000 = "${nonarch_base_libdir}/firmware/atmel/wilc1000*"
+RDEPENDS:${PN}-wilc1000 = "${PN}-atmel-license"
+
+LICENSE:${PN}-wilc3000 = "Firmware-atmel"
+FILES:${PN}-wilc3000 = "${nonarch_base_libdir}/firmware/atmel/wilc3000*"
+RDEPENDS:${PN}-wilc3000 = "${PN}-atmel-license"
+
+# For atusb - ATUSB IEEE 802.15.4 transceiver driver
+FILES:${PN}-atusb = "${nonarch_base_libdir}/firmware/atusb/*"
+LICENSE:${PN}-atusb = "GPL-2.0-or-later"
+
+# For dvb-ttpci - AV7110 cards
+FILES:${PN}-dvb-ttpci = "${nonarch_base_libdir}/firmware/av7110/*"
+LICENSE:${PN}-dvb-ttpci = "GPL-2.0-or-later"
+
+# For bmi260 - Bosch BMI260 IMU configuration data
+LICENSE:${PN}-bmi260-license = "Firmware-bmi260"
+FILES:${PN}-bmi260-license = "${nonarch_base_libdir}/firmware/LICENSE.bmi260"
+
+LICENSE:${PN}-bmi260 = "Firmware-bmi260"
+FILES:${PN}-bmi260 = "${nonarch_base_libdir}/firmware/bmi260-init-data.fw"
+RDEPENDS:${PN}-bmi260 = "${PN}-bmi260-license"
+
+# For cdns-mhdp - Cadence MHDP8546 DP bridge
+LICENSE:${PN}-cadence-license = "Firmware-cadence"
+FILES:${PN}-cadence-license = "${nonarch_base_libdir}/firmware/LICENCE.cadence"
+
+LICENSE:${PN}-mhdp8546 = "Firmware-cadence"
+FILES:${PN}-mhdp8546 = "${nonarch_base_libdir}/firmware/cadence/mhdp8546.bin"
+RDEPENDS:${PN}-mhdp8546 = "${PN}-cadence-license"
+
+# For nitrox - Cavium CNN55XX crypto driver
+LICENSE:${PN}-cavium-license = "Firmware-cavium"
+FILES:${PN}-cavium-license = "${nonarch_base_libdir}/firmware/LICENCE.cavium"
+
+LICENSE:${PN}-cnn55xx = "Firmware-cavium"
+FILES:${PN}-cnn55xx = "${nonarch_base_libdir}/firmware/cavium/cnn55xx*"
+RDEPENDS:${PN}-cnn55xx = "${PN}-cavium-license"
+
+# For BFA/BNA - QLogic BR-series Adapter FC/FCOE drivers
+LICENSE:${PN}-bfa-license = "Firmware-bfa"
+FILES:${PN}-bfa-license = "${nonarch_base_libdir}/firmware/LICENSE.bfa"
+
+LICENSE:${PN}-cbfw = "Firmware-bfa"
+FILES:${PN}-cbfw = "${nonarch_base_libdir}/firmware/cbfw-3.2.5.1.bin"
+RDEPENDS:${PN}-cbfw = "${PN}-bfa-license"
+
+LICENSE:${PN}-ctfw = "Firmware-bfa"
+FILES:${PN}-ctfw = "${nonarch_base_libdir}/firmware/ctfw-3.2.5.1.bin"
+RDEPENDS:${PN}-ctfw = "${PN}-bfa-license"
+
+LICENSE:${PN}-ct2fw = "Firmware-bfa"
+FILES:${PN}-ct2fw = "${nonarch_base_libdir}/firmware/ct2fw-3.2.5.1.bin"
+RDEPENDS:${PN}-ct2fw = "${PN}-bfa-license"
+
+# For pcnet_cs - NE2000 compatible PCMCIA adapter
+FILES:${PN}-pcnet-cs = " \
+    ${nonarch_base_libdir}/firmware/cis/LA-PCM.cis \
+    ${nonarch_base_libdir}/firmware/cis/PCMLM28.cis \
+    ${nonarch_base_libdir}/firmware/cis/DP83903.cis \
+    ${nonarch_base_libdir}/firmware/cis/NE2K.cis \
+    ${nonarch_base_libdir}/firmware/cis/tamarack.cis \
+    ${nonarch_base_libdir}/firmware/cis/PE-200.cis \
+    ${nonarch_base_libdir}/firmware/cis/PE520.cis \
+"
+LICENSE:${PN}-pcnet-cs = "GPL-2.0-only & MPL-1.1"
+
+# For 3c589_cs - 3Com PCMCIA adapter
+FILES:${PN}-3c589-cs = "${nonarch_base_libdir}/firmware/cis/3CXEM556.cis"
+LICENSE:${PN}-3c589-cs = "GPL-2.0-only & MPL-1.1"
+
+# For 3c574-cs - 3Com PCMCIA adapter
+FILES:${PN}-3c574-cs = "${nonarch_base_libdir}/firmware/cis/3CCFEM556.cis"
+LICENSE:${PN}-3c574-cs = "GPL-2.0-only & MPL-1.1"
+
+# For serial_cs - Serial PCMCIA adapter (pcmcia-cs project)
+FILES:${PN}-serial-cs = " \
+    ${nonarch_base_libdir}/firmware/cis/MT5634ZLX.cis \
+    ${nonarch_base_libdir}/firmware/cis/RS-COM-2P.cis \
+    ${nonarch_base_libdir}/firmware/cis/COMpad2.cis \
+    ${nonarch_base_libdir}/firmware/cis/COMpad4.cis \
+"
+LICENSE:${PN}-serial-cs = "GPL-2.0-only & MPL-1.1"
+
+# For Sierra Wireless serial_cs - Serial PCMCIA adapter
+FILES:${PN}-sw-serial = " \
+    ${nonarch_base_libdir}/firmware/cis/SW_555_SER.cis \
+    ${nonarch_base_libdir}/firmware/cis/SW_7xx_SER.cis \
+    ${nonarch_base_libdir}/firmware/cis/SW_8xx_SER.cis \
+"
+LICENSE:${PN}-sw-serial = "GPL-3.0-only"
+
+# For smsmdtv - Siano MDTV Core module
+LICENSE:${PN}-siano-license = "Firmware-siano"
+FILES:${PN}-siano-license = "${nonarch_base_libdir}/firmware/LICENCE.siano"
+
+LICENSE:${PN}-smsmdtv = "Firmware-siano"
+FILES:${PN}-smsmdtv = " \
+    ${nonarch_base_libdir}/firmware/cmmb_vega_12mhz.inp \
+    ${nonarch_base_libdir}/firmware/cmmb_venice_12mhz.inp \
+    ${nonarch_base_libdir}/firmware/dvb_nova_12mhz.inp \
+    ${nonarch_base_libdir}/firmware/dvb_nova_12mhz_b0.inp \
+    ${nonarch_base_libdir}/firmware/isdbt_nova_12mhz.inp \
+    ${nonarch_base_libdir}/firmware/isdbt_nova_12mhz_b0.inp \
+    ${nonarch_base_libdir}/firmware/isdbt_rio.inp \
+    ${nonarch_base_libdir}/firmware/sms1xxx-hcw-55xxx-dvbt-02.fw \
+    ${nonarch_base_libdir}/firmware/sms1xxx-hcw-55xxx-isdbt-02.fw \
+    ${nonarch_base_libdir}/firmware/sms1xxx-nova-a-dvbt-01.fw \
+    ${nonarch_base_libdir}/firmware/sms1xxx-nova-b-dvbt-01.fw \
+    ${nonarch_base_libdir}/firmware/sms1xxx-stellar-dvbt-01.fw \
+    ${nonarch_base_libdir}/firmware/tdmb_nova_12mhz.inp \
+"
+RDEPENDS:${PN}-smsmdtv = "${PN}-siano-license"
+
+# For cpia2 - cameras based on Vision's CPiA2
+FILES:${PN}-cpia2 = "${nonarch_base_libdir}/firmware/cpia2/*"
+LICENSE:${PN}-cpia2 = "GPL-2.0-or-later"
+
+# For snd-hda-codec-ca0132 - Creative Sound Core3D codec
+LICENSE:${PN}-ca0132-license = "Firmware-ca0132"
+FILES:${PN}-ca0132-license = "${nonarch_base_libdir}/firmware/LICENCE.ca0132"
+
+LICENSE:${PN}-ca0132 = "Firmware-ca0132"
+FILES:${PN}-ca0132 = " \
+    ${nonarch_base_libdir}/firmware/ctefx.bin \
+    ${nonarch_base_libdir}/firmware/ctspeq.bin \
+"
+RDEPENDS:${PN}-ca0132 = "${PN}-ca0132-license"
+
+# For cxgb3 - Chelsio Terminator 3 1G/10G Ethernet adapter
+LICENSE:${PN}-cxgb3-license = "Firmware-cxgb3"
+FILES:${PN}-cxgb3-license = "${nonarch_base_libdir}/firmware/LICENCE.cxgb3"
+
+LICENSE:${PN}-cxgb3 = "Firmware-cxgb3 & GPL-2.0-only"
+FILES:${PN}-cxgb3 = "${nonarch_base_libdir}/firmware/cxgb3/*"
+RDEPENDS:${PN}-cxgb3 = "${PN}-cxgb3-license"
+
+# For cxgb4 - Chelsio Terminator 4/5/6 1/10/25/40/100G Ethernet adapter
+LICENSE:${PN}-chelsio-firmware-license = "Firmware-chelsio_firmware"
+FILES:${PN}-chelsio-firmware-license = "${nonarch_base_libdir}/firmware/LICENCE.chelsio_firmware"
+
+LICENSE:${PN}-cxgb4 = "Firmware-chelsio_firmware"
+FILES:${PN}-cxgb4 = "${nonarch_base_libdir}/firmware/cxgb4/*"
+RDEPENDS:${PN}-cxgb4 = "${PN}-chelsio-firmware-license"
+
+# For dabusb - Digital Audio Broadcasting (DAB) Receiver for USB and Linux
+LICENSE:${PN}-dabusb-license = "Firmware-dabusb"
+FILES:${PN}-dabusb-license = "${nonarch_base_libdir}/firmware/LICENCE.dabusb"
+
+LICENSE:${PN}-dabusb = "Firmware-dabusb"
+FILES:${PN}-dabusb = "${nonarch_base_libdir}/firmware/dabusb/*"
+RDEPENDS:${PN}-dabusb = "${PN}-dabusb-license"
+
+# For dsp56k - Atari DSP56k support
+LICENSE:${PN}-dsp56k = "GPL-2.0-or-later"
+FILES:${PN}-dsp56k = "${nonarch_base_libdir}/firmware/dsp56k/*"
+
+# For dib0700 - DiBcom dib0700 USB DVB bridge driver
+LICENSE:${PN}-dib0700-license = "Firmware-dib0700"
+FILES:${PN}-dib0700-license = "${nonarch_base_libdir}/firmware/LICENSE.dib0700"
+
+LICENSE:${PN}-dib0700 = "Firmware-dib0700"
+FILES:${PN}-dib0700 = "${nonarch_base_libdir}/firmware/dvb-usb-dib0700-1.20.fw"
+RDEPENDS:${PN}-dib0700 = "${PN}-dib0700-license"
+
+# For it9135 - ITEtech IT913x DVB-T USB driver
+LICENSE:${PN}-it913x-license = "Firmware-it913x"
+FILES:${PN}-it913x-license = "${nonarch_base_libdir}/firmware/LICENCE.it913x"
+
+LICENSE:${PN}-it9135 = "Firmware-it913x"
+FILES:${PN}-it9135 = "${nonarch_base_libdir}/firmware/dvb-usb-it9135*"
+RDEPENDS:${PN}-it9135 = "${PN}-it913x-license"
+
+# For drxk - Micronas DRX-K demodulator driver
+LICENSE:${PN}-drxk-license = "Firmware-drxk"
+FILES:${PN}-drxk-license = "${nonarch_base_libdir}/firmware/LICENSE.drxk"
+
+LICENSE:${PN}-drxk = "Firmware-drxk"
+FILES:${PN}-drxk = "${nonarch_base_libdir}/firmware/dvb-usb-terratec-h5-drxk.fw"
+RDEPENDS:${PN}-drxk = "${PN}-drxk-license"
+
+# For e100 - Intel PRO/100 Ethernet NIC
+LICENSE:${PN}-e100-license = "Firmware-e100"
+FILES:${PN}-e100-license = "${nonarch_base_libdir}/firmware/LICENCE.e100"
+
+LICENSE:${PN}-e100 = "Firmware-e100"
+FILES:${PN}-e100 = "${nonarch_base_libdir}/firmware/e100/*"
+RDEPENDS:${PN}-e100 = "${PN}-e100-license"
+
+# For io_ti - USB Inside Out Edgeport Serial Driver (TI Devices)
+LICENSE:${PN}-io-ti = "GPL-2.0-or-later"
+FILES:${PN}-io-ti = "${nonarch_base_libdir}/firmware/edgeport/down3.bin"
+
+# For io_edgeport - USB Inside Out Edgeport Serial Driver
+LICENSE:${PN}-io-edgeport = "GPL-2.0-or-later"
+FILES:${PN}-io-edgeport = "${nonarch_base_libdir}/firmware/edgeport/*"
+
+# For emi26 - EMI 2|6 USB Audio interface
+LICENSE:${PN}-emi26-license = "Firmware-emi26"
+FILES:${PN}-emi26-license = "${nonarch_base_libdir}/firmware/LICENCE.emi26"
+
+LICENSE:${PN}-emi26 = "Firmware-emi26"
+FILES:${PN}-emi26 = "${nonarch_base_libdir}/firmware/emi26/*"
+RDEPENDS:${PN}-emi26 = "${PN}-drxk-license"
+
+# For ene-ub6250 - ENE UB6250 SD card reader driver
+LICENSE:${PN}-ene-firmware-license = "Firmware-ene_firmware"
+FILES:${PN}-ene-firmware-license = "${nonarch_base_libdir}/firmware/LICENCE.ene_firmware"
+
+LICENSE:${PN}-ene-ub6250 = "Firmware-ene_firmware"
+FILES:${PN}-ene-ub6250 = "${nonarch_base_libdir}/firmware/ene-ub6250/*"
+RDEPENDS:${PN}-ene-ub6250 = "${PN}-ene-firmware-license"
+
+# For go7007-s2250
+LICENSE:${PN}-go7007-s2250-license = "Firmware-go7007-s2250"
+FILES:${PN}-go7007-s2250-license = "${nonarch_base_libdir}/firmware/LICENCE.go7007-s2250"
+
+LICENSE:${PN}-go7007-s2250 = "Firmware-go7007-s2250"
+FILES:${PN}-go7007-s2250 = " \
+    ${nonarch_base_libdir}/firmware/go7007/s2250* \
+    ${nonarch_base_libdir}/firmware/s2250* \
+"
+RDEPENDS:${PN}-go7007-s2250 = "${PN}-go7007-s2250-license"
+
+# For go7007
+LICENSE:${PN}-go7007-license = "Firmware-go7007"
+FILES:${PN}-go7007-license = "${nonarch_base_libdir}/firmware/LICENCE.go7007"
+
+LICENSE:${PN}-go7007 = "Firmware-go7007"
+FILES:${PN}-go7007 = "${nonarch_base_libdir}/firmware/go7007/*"
+RDEPENDS:${PN}-go7007 = "${PN}-go7007-license"
+
+# For hfi1 - Intel OPA Gen 1 adapter
+LICENSE:${PN}-hfi1-license = "Firmware-hfi1_firmware"
+FILES:${PN}-hfi1-license = "${nonarch_base_libdir}/firmware/LICENSE.hfi1_firmware"
+
+LICENSE:${PN}-hfi1 = "Firmware-hfi1_firmware"
+FILES:${PN}-hfi1 = "${nonarch_base_libdir}/firmware/hfi1_*"
+RDEPENDS:${PN}-hfi1 = "${PN}-hfi1-license"
+
+# For inside-secure - Inside Secure EIP197 crypto driver
+LICENSE:${PN}-inside-secure-license = "Firmware-inside-secure"
+FILES:${PN}-inside-secure-license = "${nonarch_base_libdir}/firmware/LICENCE.inside-secure"
+
+LICENSE:${PN}-inside-secure = "Firmware-inside-secure"
+FILES:${PN}-inside-secure = "${nonarch_base_libdir}/firmware/inside-secure/*"
+RDEPENDS:${PN}-inside-secure = "${PN}-inside-secure-license"
+
+# For snd_soc_catpt - Intel AudioDSP driver for HSW/BDW platforms
+LICENSE:${PN}-intcsst2-license = "Firmware-IntcSST2"
+FILES:${PN}-intcsst2-license = "${nonarch_base_libdir}/firmware/LICENCE.IntcSST2"
+
+LICENSE:${PN}-snd-soc-catpt = "Firmware-IntcSST2"
+FILES:${PN}-snd-soc-catpt = " \
+    ${nonarch_base_libdir}/firmware/intel/catpt/bdw/dsp_basefw.bin \
+    ${nonarch_base_libdir}/firmware/intel/IntcSST2.bin \
+"
+RDEPENDS:${PN}-snd-soc-catpt = "${PN}-intcsst2-license"
+
+# For snd_intel_sst_core
+LICENSE:${PN}-fw-sst-0f28-license = "Firmware-fw_sst_0f28"
+FILES:${PN}-fw-sst-0f28-license = "${nonarch_base_libdir}/firmware/LICENCE.fw_sst_0f28"
+
+LICENSE:${PN}-snd-intel-sst-core = "Firmware-fw_sst_0f28"
+FILES:${PN}-snd-intel-sst-core = "${nonarch_base_libdir}/firmware/intel/fw_sst_*"
+RDEPENDS:${PN}-snd-intel-sst-core = "${PN}-fw-sst-0f28-license"
+
+# For atomisp - Intel IPU2 (Image Processing Unit 2) driver
+LICENSE:${PN}-ivsc-license = "Firmware-ivsc"
+FILES:${PN}-ivsc-license = "${nonarch_base_libdir}/firmware/LICENSE.ivsc"
+
+LICENSE:${PN}-atomisp = "Firmware-ivsc"
+FILES:${PN}-atomisp = "${nonarch_base_libdir}/firmware/intel/ipu/shisp_240*"
+RDEPENDS:${PN}-atomisp = "${PN}-ivsc-license"
+
+# For intel-ipu6-isys - Intel IPU6 (Image Processing Unit 6) driver
+LICENSE:${PN}-intel-ipu6-isys = "Firmware-ivsc"
+FILES:${PN}-intel-ipu6-isys = "${nonarch_base_libdir}/firmware/intel/ipu/ipu6*"
+RDEPENDS:${PN}-intel-ipu6-isys = "${PN}-ivsc-license"
+
+# For mei-vsc-hw - Intel Visual Sensing Controller
+LICENSE:${PN}-mei-vsc-hw = "Firmware-ivsc"
+FILES:${PN}-mei-vsc-hw = "${nonarch_base_libdir}/firmware/intel/vsc/*"
+RDEPENDS:${PN}-mei-vsc-hw = "${PN}-ivsc-license"
+
+# For ipu3-imgu - Intel IPU3 (3rd Gen Image Processing Unit) driver
+LICENSE:${PN}-ipu3-firmware-license = "Firmware-ipu3_firmware"
+FILES:${PN}-ipu3-firmware-license = "${nonarch_base_libdir}/firmware/LICENSE.ipu3_firmware"
+
+LICENSE:${PN}-ipu3-imgu = "Firmware-ipu3_firmware"
+FILES:${PN}-ipu3-imgu = " \
+    ${nonarch_base_libdir}/firmware/intel/ipu/irci_irci_ecr-master_20161208_0213_20170112_1500.bin \
+    ${nonarch_base_libdir}/firmware/intel/ipu3-fw.bin \
+    ${nonarch_base_libdir}/firmware/intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin \
+"
+RDEPENDS:${PN}-ipu3-imgu = "${PN}-ipu3-firmware-license"
+
+# For intel-ipu7-isys - Intel IPU7 (Image Processing Unit 7) driver
+LICENSE:${PN}-intel-ipu7-isys = "Firmware-intel"
+FILES:${PN}-intel-ipu7-isys = "${nonarch_base_libdir}/firmware/intel/ipu/ipu7*"
+RDEPENDS:${PN}-intel-ipu7-isys = "${PN}-intel-license"
+
+# For intel_vpu - Intel NPU driver
+LICENSE:${PN}-intel-vpu-license = "Firmware-intel_vpu"
+FILES:${PN}-intel-vpu-license = "${nonarch_base_libdir}/firmware/LICENSE.intel_vpu"
+
+LICENSE:${PN}-intel-vpu = "Firmware-intel_vpu"
+FILES:${PN}-intel-vpu = "${nonarch_base_libdir}/firmware/intel/vpu/*"
+RDEPENDS:${PN}-intel-vpu = "${PN}-intel-vpu-license"
+
+# For isci - Intel C600 SAS controller driver
+LICENSE:${PN}-isci = "GPL-2.0-only"
+FILES:${PN}-isci = "${nonarch_base_libdir}/firmware/isci/*"
+
+# For ixp4xx-npe - Intel IXP4xx XScale Network Processing Engine (NPE) Firmware
+LICENSE:${PN}-ixp4xx-license = "Firmware-ixp4xx"
+FILES:${PN}-ixp4xx-license = "${nonarch_base_libdir}/firmware/LICENSE.ixp4xx"
+
+LICENSE:${PN}-ixp4xx-npe = "Firmware-ixp4xx"
+FILES:${PN}-ixp4xx-npe = "${nonarch_base_libdir}/firmware/ixp4xx/*"
+RDEPENDS:${PN}-ixp4xx-npe = "${PN}-ixp4xx-license"
+
+# For kaweth - USB KLSI KL5USB101-based Ethernet device
+LICENSE:${PN}-kaweth-license = "Firmware-kaweth"
+FILES:${PN}-kaweth-license = "${nonarch_base_libdir}/firmware/LICENCE.kaweth"
+
+LICENSE:${PN}-kaweth = "Firmware-kaweth"
+FILES:${PN}-kaweth = "${nonarch_base_libdir}/firmware/kaweth/*"
+RDEPENDS:${PN}-kaweth = "${PN}-kaweth-license"
+
+# For keyspan - USB Keyspan USA-xxx serial device
+LICENSE:${PN}-keyspan-license = "Firmware-keyspan"
+FILES:${PN}-keyspan-license = "${nonarch_base_libdir}/firmware/LICENCE.keyspan"
+
+LICENSE:${PN}-keyspan = "Firmware-keyspan"
+FILES:${PN}-keyspan = "${nonarch_base_libdir}/firmware/keyspan/*"
+RDEPENDS:${PN}-keyspan = "${PN}-keyspan-license"
+
+# For keyspan_pda - USB Keyspan PDA single-port serial device
+LICENSE:${PN}-keyspan-pda = "GPL-2.0-or-later"
+FILES:${PN}-keyspan-pda = "${nonarch_base_libdir}/firmware/keyspan_pda/*"
+
+# For mga - Matrox G200/G400/G550
+LICENSE:${PN}-mga-license = "Firmware-mga"
+FILES:${PN}-mga-license = "${nonarch_base_libdir}/firmware/LICENSE.mga"
+
+LICENSE:${PN}-mga = "Firmware-mga"
+FILES:${PN}-mga = "${nonarch_base_libdir}/firmware/matrox/*"
+RDEPENDS:${PN}-mga = "${PN}-mga-license"
+
+# For myri10ge - Myri10GE 10GbE NIC driver
+LICENSE:${PN}-myri10ge-firmware-license = "Firmware-myri10ge_firmware"
+FILES:${PN}-myri10ge-firmware-license = "${nonarch_base_libdir}/firmware/LICENCE.myri10ge_firmware"
+
+LICENSE:${PN}-myri10ge = "Firmware-myri10ge_firmware"
+FILES:${PN}-myri10ge = "${nonarch_base_libdir}/firmware/myri10ge_*"
+RDEPENDS:${PN}-myri10ge = "${PN}-myri10ge-firmware-license"
+
+# For smc91c92_cs - SMC 91Cxx PCMCIA
+LICENSE:${PN}-smc91c92-cs = "GPL-1.0-only"
+FILES:${PN}-smc91c92-cs = "${nonarch_base_libdir}/firmware/ositech/Xilinx7OD.bin"
+
+# For qla1280 - Qlogic QLA 1240/1x80/1x160 SCSI support
+LICENSE:${PN}-qla1280-license = "Firmware-qla1280"
+FILES:${PN}-qla1280-license = "${nonarch_base_libdir}/firmware/LICENCE.qla1280"
+
+LICENSE:${PN}-qla1280 = "Firmware-qla1280"
+FILES:${PN}-qla1280 = " \
+    ${nonarch_base_libdir}/firmware/qlogic/1040.bin \
+    ${nonarch_base_libdir}/firmware/qlogic/1280.bin \
+    ${nonarch_base_libdir}/firmware/qlogic/12160.bin \
+"
+RDEPENDS:${PN}-qla1280 = "${PN}-qla1280-license"
+
+# For ib_qib - QLogic Infiniband
+LICENSE:${PN}-ib-qib-license = "Firmware-ib_qib"
+FILES:${PN}-ib-qib-license = "${nonarch_base_libdir}/firmware/LICENSE.ib_qib"
+
+LICENSE:${PN}-ib-qib = "Firmware-ib_qib"
+FILES:${PN}-ib-qib = "${nonarch_base_libdir}/firmware/qlogic/sd7220.fw"
+RDEPENDS:${PN}-ib-qib = "${PN}-ib-qib-license"
+
+# For xhci-rcar - Renesas R-Car Gen2/3 USB 3.0 host controller driver
+LICENSE:${PN}-r8a779x-usb3-license = "Firmware-r8a779x_usb3"
+FILES:${PN}-r8a779x-usb3-license = "${nonarch_base_libdir}/firmware/LICENCE.r8a779x_usb3"
+
+LICENSE:${PN}-xhci-rcar = "Firmware-r8a779x_usb3"
+FILES:${PN}-xhci-rcar = "${nonarch_base_libdir}/firmware/r8a779x_usb3_*"
+RDEPENDS:${PN}-xhci-rcar = "${PN}-r8a779x-usb3-license"
+
+# For r128 - ATI Rage 128
+LICENSE:${PN}-r128 = "MIT"
+FILES:${PN}-r128 = "${nonarch_base_libdir}/firmware/r128/*"
+
+# For rt1320 - Realtek rt1320 ASoC audio driver.
+LICENSE:${PN}-rt1320-license = "Firmware-rt1320"
+FILES:${PN}-rt1320-license = "${nonarch_base_libdir}/firmware/LICENSE.rt1320"
+
+LICENSE:${PN}-rt1320 = "Firmware-rt1320"
+FILES:${PN}-rt1320 = "${nonarch_base_libdir}/firmware/realtek/rt1320/*"
+RDEPENDS:${PN}-rt1320 = "${PN}-rt1320-license"
+
+# For rp2 - Comtrol RocketPort 2 serial driver
+LICENSE:${PN}-rp2-license = "Firmware-rp2"
+FILES:${PN}-rp2-license = "${nonarch_base_libdir}/firmware/LICENSE.rp2"
+
+LICENSE:${PN}-rp2 = "Firmware-rp2"
+FILES:${PN}-rp2 = "${nonarch_base_libdir}/firmware/rp2.fw"
+RDEPENDS:${PN}-rp2 = "${PN}-rp2-license"
+
+# For s5p-mfc - Samsung MFC video encoder/decoder driver
+LICENSE:${PN}-s5p-mfc-license = "Firmware-s5p-mfc"
+FILES:${PN}-s5p-mfc-license = "${nonarch_base_libdir}/firmware/LICENSE.s5p-mfc"
+
+LICENSE:${PN}-s5p-mfc = "Firmware-s5p-mfc"
+FILES:${PN}-s5p-mfc = "${nonarch_base_libdir}/firmware/s5p-mfc*"
+RDEPENDS:${PN}-s5p-mfc = "${PN}-s5p-mfc-license"
+
+# For snd-sb16-csp - Sound Blaster 16/AWE CSP support
+LICENSE:${PN}-snd-sb16-csp = "GPL-2.0-or-later"
+FILES:${PN}-snd-sb16-csp = "${nonarch_base_libdir}/firmware/sb16/*"
+
+# For slicoss - Alacritech IS-NIC products
+LICENSE:${PN}-alacritech-license = "Firmware-alacritech"
+FILES:${PN}-alacritech-license = "${nonarch_base_libdir}/firmware/LICENCE.alacritech"
+
+LICENSE:${PN}-slicoss = "Firmware-alacritech"
+FILES:${PN}-slicoss = "${nonarch_base_libdir}/firmware/slicoss/*"
+RDEPENDS:${PN}-slicoss = "${PN}-alacritech-license"
+
+LICENSE:${PN}-sxg = "Firmware-alacritech"
+FILES:${PN}-sxg = "${nonarch_base_libdir}/firmware/sxg/*"
+RDEPENDS:${PN}-sxg = "${PN}-alacritech-license"
+
+# For tehuti - Tehuti Networks 10G Ethernet
+LICENSE:${PN}-tehuti-license = "Firmware-tehuti"
+FILES:${PN}-tehuti-license = "${nonarch_base_libdir}/firmware/LICENSE.tehuti"
+
+LICENSE:${PN}-tehuti = "Firmware-tehuti"
+FILES:${PN}-tehuti = "${nonarch_base_libdir}/firmware/tehuti/*"
+RDEPENDS:${PN}-tehuti = "${PN}-tehuti-license"
+
+# For tg3 - Broadcom Tigon3 based gigabit Ethernet cards
+LICENSE:${PN}-tigon-license = "Firmware-tigon"
+FILES:${PN}-tigon-license = "${nonarch_base_libdir}/firmware/LICENCE.tigon"
+
+LICENSE:${PN}-tg3 = "Firmware-tigon"
+FILES:${PN}-tg3 = "${nonarch_base_libdir}/firmware/tigon/*"
+RDEPENDS:${PN}-tg3 = "${PN}-tigon-license"
+
+# For tlg2300 - Telgent 2300 V4L/DVB driver.
+LICENSE:${PN}-tlg2300-license = "Firmware-tlg2300"
+FILES:${PN}-tlg2300-license = "${nonarch_base_libdir}/firmware/LICENSE.tlg2300"
+
+LICENSE:${PN}-tlg2300 = "Firmware-tlg2300"
+FILES:${PN}-tlg2300 = "${nonarch_base_libdir}/firmware/tlg2300*"
+RDEPENDS:${PN}-tlg2300 = "${PN}-tlg2300-license"
+
+# For Mont-TSSE - Mont-TSSE(TM) Crypto Algorithm Accelerator Driver
+LICENSE:${PN}-montage-license = "Firmware-montage"
+FILES:${PN}-montage-license = "${nonarch_base_libdir}/firmware/LICENSE.montage"
+
+LICENSE:${PN}-mont-tsse = "Firmware-montage"
+FILES:${PN}-mont-tsse = "${nonarch_base_libdir}/firmware/tsse_firmware.bin"
+RDEPENDS:${PN}-mont-tsse = "${PN}-montage-license"
+
+# For ueagle-atm - Driver for USB ADSL Modems based on Eagle IV Chipset
+LICENSE:${PN}-ueagle-atm4-firmware-license = "Firmware-ueagle-atm4-firmware"
+FILES:${PN}-ueagle-atm4-firmware-license = "${nonarch_base_libdir}/firmware/LICENCE.ueagle-atm4-firmware"
+
+LICENSE:${PN}-ueagle-atm = "Firmware-ueagle-atm4-firmware"
+FILES:${PN}-ueagle-atm = " \
+    ${nonarch_base_libdir}/firmware/ueagle-atm/CMV4p.bin.v2 \
+    ${nonarch_base_libdir}/firmware/ueagle-atm/DSP4p.bin \
+    ${nonarch_base_libdir}/firmware/ueagle-atm/eagleIV.fw \
+"
+RDEPENDS:${PN}-ueagle-atm = "${PN}-ueagle-atm4-firmware-license"
+
+# For usbdux/usbduxfast/usbduxsigma - usbdux data acquisition cards
+LICENSE:${PN}-usbdux = "GPL-2.0-or-later"
+FILES:${PN}-usbdux = "${nonarch_base_libdir}/firmware/usbdux*"
+
+# For cx231xx - Conexant Cx23100/101/102 USB broadcast A/V decoder
+LICENSE:${PN}-conexant-license = "Firmware-conexant"
+FILES:${PN}-conexant-license = "${nonarch_base_libdir}/firmware/LICENSE.conexant"
+
+LICENSE:${PN}-cx231xx = "Firmware-conexant"
+FILES:${PN}-cx231xx = "${nonarch_base_libdir}/firmware/v4l-cx231xx*"
+RDEPENDS:${PN}-cx231xx = "${PN}-conexant-license"
+
+LICENSE:${PN}-cx23418 = "Firmware-conexant"
+FILES:${PN}-cx23418 = "${nonarch_base_libdir}/firmware/v4l-cx23418*"
+RDEPENDS:${PN}-cx23418 = "${PN}-conexant-license"
+
+LICENSE:${PN}-cx23885 = "Firmware-conexant"
+FILES:${PN}-cx23885 = "${nonarch_base_libdir}/firmware/v4l-cx23885*"
+RDEPENDS:${PN}-cx23885 = "${PN}-conexant-license"
+
+LICENSE:${PN}-cx23840 = "Firmware-conexant"
+FILES:${PN}-cx23840 = "${nonarch_base_libdir}/firmware/v4l-cx25840*"
+RDEPENDS:${PN}-cx23840 = "${PN}-conexant-license"
+
+# For vxge - Exar X3100 Series 10GbE PCIe I/O Virtualized Server Adapter
+LICENSE:${PN}-vxge-license = "Firmware-vxge"
+FILES:${PN}-vxge-license = "${nonarch_base_libdir}/firmware/LICENSE.vxge"
+
+LICENSE:${PN}-vxge = "Firmware-vxge"
+FILES:${PN}-vxge = "${nonarch_base_libdir}/firmware/vxge/*"
+RDEPENDS:${PN}-vxge = "${PN}-vxge-license"
+
+# For whiteheat - USB ConnectTech WhiteHEAT serial device
+LICENSE:${PN}-whiteheat = "GPL-2.0-only"
+FILES:${PN}-whiteheat = "${nonarch_base_libdir}/firmware/whiteheat*"
+
+# For wil6210 - Qualcomm Atheros support for 11ad family of chips
+LICENSE:${PN}-qualcommatheros-ath10k-license = "Firmware-qualcommAthos_ath10k"
+FILES:${PN}-qualcommatheros-ath10k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ath10k"
+
+LICENSE:${PN}-wil6210 = "Firmware-qualcommAthos_ath10k"
+FILES:${PN}-wil6210 = "${nonarch_base_libdir}/firmware/wil6210*"
+RDEPENDS:${PN}-wil6210 = "${PN}-qualcommatheros-ath10k-license"
+
+# For xe - Intel Graphics driver
+LICENSE:${PN}-xe-license = "Firmware-xe"
+FILES:${PN}-xe-license = "${nonarch_base_libdir}/firmware/LICENSE.xe"
+
+LICENSE:${PN}-xe = "Firmware-xe"
+FILES:${PN}-xe = "${nonarch_base_libdir}/firmware/xe/*"
+RDEPENDS:${PN}-xe = "${PN}-xe-license"
+
 # For other firmwares
 # Maybe split out to separate packages when needed.
 LICENSE:${PN} = "\
@@ -2269,6 +3267,7 @@ LICENSE:${PN} = "\
     & Firmware-IntcSST2 \
     & Firmware-kaweth \
     & Firmware-keyspan \
+    & Firmware-lenovo \
     & Firmware-mellanox \
     & Firmware-mga \
     & Firmware-montage \
@@ -2312,8 +3311,13 @@ LICENSE:${PN} = "\
     & WHENCE \
 "
 
+# The goal for this recipe is to creata bunch of breakout packages for the
+# firmware so that you can choose which files to include and not have to pull
+# them all in.  To that end, we do want any files to be part of the
+# linux-firmware package.  So set it to "".  Do not change this.
+FILES:${PN} = ""
+
 FILES:${PN}-license += "${nonarch_base_libdir}/firmware/LICEN*"
-FILES:${PN} += "${nonarch_base_libdir}/firmware/*"
 RDEPENDS:${PN} += "${PN}-license"
 RDEPENDS:${PN} += "${PN}-whence-license"
 
diff --git a/scripts/install-buildtools b/scripts/install-buildtools
index 50b5487eb8..93f3e2d678 100755
--- a/scripts/install-buildtools
+++ b/scripts/install-buildtools
@@ -57,8 +57,8 @@ logger = scriptutils.logger_create(PROGNAME, stream=sys.stdout)
 
 DEFAULT_INSTALL_DIR = os.path.join(os.path.split(scripts_path)[0],'buildtools')
 DEFAULT_BASE_URL = 'https://downloads.yoctoproject.org/releases/yocto'
-DEFAULT_RELEASE = 'yocto-5.2.2'
-DEFAULT_INSTALLER_VERSION = '5.2.2'
+DEFAULT_RELEASE = 'yocto-5.2.3'
+DEFAULT_INSTALLER_VERSION = '5.2.3'
 DEFAULT_BUILDDATE = '202110XX'
 
 # Python version sanity check
diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index b9e60cbe4e..9d596be3a7 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -345,29 +345,64 @@ class Disk:
                                                    path))
 
     def copy(self, src, dest):
-        """Copy partition image into wic image."""
-        pnum =  dest.part if isinstance(src, str) else src.part
+        """Copy files or directories to/from the vfat or ext* partition."""
+        pnum = dest.part if isinstance(src, str) else src.part
+        partimg = self._get_part_image(pnum)
 
         if self.partitions[pnum].fstype.startswith('ext'):
-            if isinstance(src, str):
-                cmd = "printf 'cd {}\nwrite {} {}\n' | {} -w {}".\
-                      format(os.path.dirname(dest.path), src, os.path.basename(src),
-                             self.debugfs, self._get_part_image(pnum))
-            else: # copy from wic
-                # run both dump and rdump to support both files and directory
+            if isinstance(src, str): # host to image case
+                if os.path.isdir(src):
+                    base = os.path.abspath(src)
+                    base_parent = os.path.dirname(base)
+                    cmds = []
+                    made = set()
+
+                    for root, dirs, files in os.walk(base):
+                        for fname in files:
+                            host_file = os.path.join(root, fname)
+                            rel = os.path.relpath(host_file, base_parent)
+                            dest_file = os.path.join(dest.path, rel)
+                            dest_dir = os.path.dirname(dest_file)
+
+                            # create dir structure (mkdir -p)
+                            parts = dest_dir.strip('/').split('/')
+                            cur = ''
+                            for p in parts:
+                                cur = cur + '/' + p
+                                if cur not in made:
+                                    cmds.append(f'mkdir "{cur}"')
+                                    made.add(cur)
+
+                            cmds.append(f'write "{host_file}" "{dest_file}"')
+
+                    # write script to a temp file
+                    with tempfile.NamedTemporaryFile(mode='w', delete=False,
+                                                     prefix='wic-debugfs-') as tf:
+                        for line in cmds:
+                            tf.write(line + '\n')
+                        scriptname = tf.name
+
+                    cmd = f"{self.debugfs} -w -f {scriptname} {partimg}"
+
+                else: # single file
+                    cmd = "printf 'cd {}\nwrite {} {}\n' | {} -w {}".\
+                          format(os.path.dirname(dest.path), src,
+                                 os.path.basename(src), self.debugfs, partimg)
+
+            else: # image to host case
                 cmd = "printf 'cd {}\ndump /{} {}\nrdump /{} {}\n' | {} {}".\
                       format(os.path.dirname(src.path), src.path,
-                             dest, src.path, dest, self.debugfs,
-                             self._get_part_image(pnum))
+                             dest, src.path, dest, self.debugfs, partimg)
+
         else: # fat
             if isinstance(src, str):
                 cmd = "{} -i {} -snop {} ::{}".format(self.mcopy,
-                                                  self._get_part_image(pnum),
-                                                  src, dest.path)
+                                                      partimg,
+                                                      src, dest.path)
             else:
                 cmd = "{} -i {} -snop ::{} {}".format(self.mcopy,
-                                                  self._get_part_image(pnum),
-                                                  src.path, dest)
+                                                      partimg,
+                                                      src.path, dest)
 
         exec_cmd(cmd, as_shell=True)
         self._put_part_image(pnum)
diff --git a/scripts/runqemu b/scripts/runqemu
index 2be7a0f286..72d827260f 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -421,8 +421,27 @@ class BaseConfig(object):
         else:
             raise RunQemuError("Unknown path arg %s" % p)
 
-    def uncompress_rootfs(self):
-        """Decompress ZST rootfs image if needed"""
+    def rootfs_fixups(self):
+
+        """Decompress and/or resize the rootfs image, if needed"""
+        qb_rootfs_opt = self.get('QB_ROOTFS_OPT')
+
+        # Check if sdcard size is a power of 2, as that is currently a requirement for qemu
+        # See https://gitlab.com/qemu-project/qemu/-/issues/1754
+        rootfs_size = os.path.getsize(self.rootfs)
+        rootfs_size_pwr2 = 1 << (rootfs_size - 1).bit_length()
+        if ("if=sd" in qb_rootfs_opt or "if=pflash" in qb_rootfs_opt) and rootfs_size != rootfs_size_pwr2:
+            logger.info("Using sd-card or pflash and is not power of 2. File size %d, power of 2 size %d" %(rootfs_size, rootfs_size_pwr2))
+            logger.info("Attempting to use truncate to correct this.")
+
+            # Ensure the 'truncate' tool is installed before attempting to make a power of 2.
+            if not shutil.which('truncate'):
+                raise RunQemuError(f"'truncate' is required to make {self.rootfs} a power of 2 in size but was not found in PATH")
+            try:
+                subprocess.check_call(['truncate', '-s', str(rootfs_size_pwr2), self.rootfs])
+            except subprocess.CalledProcessError as e:
+                raise RunQemuError(f"Failed to make {self.rootfs} power of 2 in size: {e}")
+
         if not self.rootfs or not self.fstype.endswith('.zst'):
             return
         
@@ -884,7 +903,7 @@ to your build configuration.
         self.set('QB_MEM', qb_mem)
 
         mach = self.get('MACHINE')
-        if not mach.startswith(('qemumips', 'qemux86', 'qemuloongarch64')):
+        if not mach.startswith(('qemumips', 'qemux86', 'qemuloongarch64')) and self.get('QB_DTB') == "":
             self.kernel_cmdline_script += ' mem=%s' % self.get('QB_MEM').replace('-m','').strip() + 'M'
 
         self.qemu_opt_script += ' %s' % self.get('QB_MEM')
@@ -1783,7 +1802,7 @@ def main():
         config.check_args()
         config.read_qemuboot()
         config.check_and_set()
-        config.uncompress_rootfs()
+        config.rootfs_fixups()
         # Check whether the combos is valid or not
         config.validate_combos()
         config.print_config()