Update for 2021.05.1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

.clang-format

@@ -1,567 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# clang-format configuration file. Intended for clang-format >= 4.
-#
-# For more information, see:
-#
-#   Documentation/process/clang-format.rst
-#   https://clang.llvm.org/docs/ClangFormat.html
-#   https://clang.llvm.org/docs/ClangFormatStyleOptions.html
-#
-
-# Buildroot: imported from Linux 5.15.6, with minimal modifications.
-#            Please note, this is not enforced at the moment. Intended
-#            as an aid when working with in-tree C files, like
-#            makedevs.c
-#
----
-AccessModifierOffset: -4
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-#AlignEscapedNewlines: Left # Unknown to clang-format-4.0
-AlignOperands: true
-AlignTrailingComments: false
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:
-  AfterClass: false
-  AfterControlStatement: false
-  AfterEnum: false
-  AfterFunction: true
-  AfterNamespace: true
-  AfterObjCDeclaration: false
-  AfterStruct: false
-  AfterUnion: false
-  #AfterExternBlock: false # Unknown to clang-format-5.0
-  BeforeCatch: false
-  BeforeElse: false
-  IndentBraces: false
-  #SplitEmptyFunction: true # Unknown to clang-format-4.0
-  #SplitEmptyRecord: true # Unknown to clang-format-4.0
-  #SplitEmptyNamespace: true # Unknown to clang-format-4.0
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Custom
-#BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0
-BreakBeforeTernaryOperators: false
-BreakConstructorInitializersBeforeComma: false
-#BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: false
-ColumnLimit: 132 # Specially for Buildroot
-CommentPragmas: '^ IWYU pragma:'
-#CompactNamespaces: false # Unknown to clang-format-4.0
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 8
-ContinuationIndentWidth: 8
-Cpp11BracedListStyle: false
-DerivePointerAlignment: false
-DisableFormat: false
-ExperimentalAutoDetectBinPacking: false
-#FixNamespaceComments: false # Unknown to clang-format-4.0
-
-# Taken from:
-#   git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ \
-#   | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$,  - '\1'," \
-#   | sort | uniq
-ForEachMacros:
-  - 'apei_estatus_for_each_section'
-  - 'ata_for_each_dev'
-  - 'ata_for_each_link'
-  - '__ata_qc_for_each'
-  - 'ata_qc_for_each'
-  - 'ata_qc_for_each_raw'
-  - 'ata_qc_for_each_with_internal'
-  - 'ax25_for_each'
-  - 'ax25_uid_for_each'
-  - '__bio_for_each_bvec'
-  - 'bio_for_each_bvec'
-  - 'bio_for_each_bvec_all'
-  - 'bio_for_each_integrity_vec'
-  - '__bio_for_each_segment'
-  - 'bio_for_each_segment'
-  - 'bio_for_each_segment_all'
-  - 'bio_list_for_each'
-  - 'bip_for_each_vec'
-  - 'bitmap_for_each_clear_region'
-  - 'bitmap_for_each_set_region'
-  - 'blkg_for_each_descendant_post'
-  - 'blkg_for_each_descendant_pre'
-  - 'blk_queue_for_each_rl'
-  - 'bond_for_each_slave'
-  - 'bond_for_each_slave_rcu'
-  - 'bpf_for_each_spilled_reg'
-  - 'btree_for_each_safe128'
-  - 'btree_for_each_safe32'
-  - 'btree_for_each_safe64'
-  - 'btree_for_each_safel'
-  - 'card_for_each_dev'
-  - 'cgroup_taskset_for_each'
-  - 'cgroup_taskset_for_each_leader'
-  - 'cpufreq_for_each_entry'
-  - 'cpufreq_for_each_entry_idx'
-  - 'cpufreq_for_each_valid_entry'
-  - 'cpufreq_for_each_valid_entry_idx'
-  - 'css_for_each_child'
-  - 'css_for_each_descendant_post'
-  - 'css_for_each_descendant_pre'
-  - 'device_for_each_child_node'
-  - 'displayid_iter_for_each'
-  - 'dma_fence_chain_for_each'
-  - 'do_for_each_ftrace_op'
-  - 'drm_atomic_crtc_for_each_plane'
-  - 'drm_atomic_crtc_state_for_each_plane'
-  - 'drm_atomic_crtc_state_for_each_plane_state'
-  - 'drm_atomic_for_each_plane_damage'
-  - 'drm_client_for_each_connector_iter'
-  - 'drm_client_for_each_modeset'
-  - 'drm_connector_for_each_possible_encoder'
-  - 'drm_for_each_bridge_in_chain'
-  - 'drm_for_each_connector_iter'
-  - 'drm_for_each_crtc'
-  - 'drm_for_each_crtc_reverse'
-  - 'drm_for_each_encoder'
-  - 'drm_for_each_encoder_mask'
-  - 'drm_for_each_fb'
-  - 'drm_for_each_legacy_plane'
-  - 'drm_for_each_plane'
-  - 'drm_for_each_plane_mask'
-  - 'drm_for_each_privobj'
-  - 'drm_mm_for_each_hole'
-  - 'drm_mm_for_each_node'
-  - 'drm_mm_for_each_node_in_range'
-  - 'drm_mm_for_each_node_safe'
-  - 'flow_action_for_each'
-  - 'for_each_acpi_dev_match'
-  - 'for_each_active_dev_scope'
-  - 'for_each_active_drhd_unit'
-  - 'for_each_active_iommu'
-  - 'for_each_aggr_pgid'
-  - 'for_each_available_child_of_node'
-  - 'for_each_bio'
-  - 'for_each_board_func_rsrc'
-  - 'for_each_bvec'
-  - 'for_each_card_auxs'
-  - 'for_each_card_auxs_safe'
-  - 'for_each_card_components'
-  - 'for_each_card_dapms'
-  - 'for_each_card_pre_auxs'
-  - 'for_each_card_prelinks'
-  - 'for_each_card_rtds'
-  - 'for_each_card_rtds_safe'
-  - 'for_each_card_widgets'
-  - 'for_each_card_widgets_safe'
-  - 'for_each_cgroup_storage_type'
-  - 'for_each_child_of_node'
-  - 'for_each_clear_bit'
-  - 'for_each_clear_bit_from'
-  - 'for_each_cmsghdr'
-  - 'for_each_compatible_node'
-  - 'for_each_component_dais'
-  - 'for_each_component_dais_safe'
-  - 'for_each_comp_order'
-  - 'for_each_console'
-  - 'for_each_cpu'
-  - 'for_each_cpu_and'
-  - 'for_each_cpu_not'
-  - 'for_each_cpu_wrap'
-  - 'for_each_dapm_widgets'
-  - 'for_each_dev_addr'
-  - 'for_each_dev_scope'
-  - 'for_each_dma_cap_mask'
-  - 'for_each_dpcm_be'
-  - 'for_each_dpcm_be_rollback'
-  - 'for_each_dpcm_be_safe'
-  - 'for_each_dpcm_fe'
-  - 'for_each_drhd_unit'
-  - 'for_each_dss_dev'
-  - 'for_each_dtpm_table'
-  - 'for_each_efi_memory_desc'
-  - 'for_each_efi_memory_desc_in_map'
-  - 'for_each_element'
-  - 'for_each_element_extid'
-  - 'for_each_element_id'
-  - 'for_each_endpoint_of_node'
-  - 'for_each_evictable_lru'
-  - 'for_each_fib6_node_rt_rcu'
-  - 'for_each_fib6_walker_rt'
-  - 'for_each_free_mem_pfn_range_in_zone'
-  - 'for_each_free_mem_pfn_range_in_zone_from'
-  - 'for_each_free_mem_range'
-  - 'for_each_free_mem_range_reverse'
-  - 'for_each_func_rsrc'
-  - 'for_each_hstate'
-  - 'for_each_if'
-  - 'for_each_iommu'
-  - 'for_each_ip_tunnel_rcu'
-  - 'for_each_irq_nr'
-  - 'for_each_link_codecs'
-  - 'for_each_link_cpus'
-  - 'for_each_link_platforms'
-  - 'for_each_lru'
-  - 'for_each_matching_node'
-  - 'for_each_matching_node_and_match'
-  - 'for_each_member'
-  - 'for_each_memcg_cache_index'
-  - 'for_each_mem_pfn_range'
-  - '__for_each_mem_range'
-  - 'for_each_mem_range'
-  - '__for_each_mem_range_rev'
-  - 'for_each_mem_range_rev'
-  - 'for_each_mem_region'
-  - 'for_each_migratetype_order'
-  - 'for_each_msi_entry'
-  - 'for_each_msi_entry_safe'
-  - 'for_each_msi_vector'
-  - 'for_each_net'
-  - 'for_each_net_continue_reverse'
-  - 'for_each_netdev'
-  - 'for_each_netdev_continue'
-  - 'for_each_netdev_continue_rcu'
-  - 'for_each_netdev_continue_reverse'
-  - 'for_each_netdev_feature'
-  - 'for_each_netdev_in_bond_rcu'
-  - 'for_each_netdev_rcu'
-  - 'for_each_netdev_reverse'
-  - 'for_each_netdev_safe'
-  - 'for_each_net_rcu'
-  - 'for_each_new_connector_in_state'
-  - 'for_each_new_crtc_in_state'
-  - 'for_each_new_mst_mgr_in_state'
-  - 'for_each_new_plane_in_state'
-  - 'for_each_new_private_obj_in_state'
-  - 'for_each_node'
-  - 'for_each_node_by_name'
-  - 'for_each_node_by_type'
-  - 'for_each_node_mask'
-  - 'for_each_node_state'
-  - 'for_each_node_with_cpus'
-  - 'for_each_node_with_property'
-  - 'for_each_nonreserved_multicast_dest_pgid'
-  - 'for_each_of_allnodes'
-  - 'for_each_of_allnodes_from'
-  - 'for_each_of_cpu_node'
-  - 'for_each_of_pci_range'
-  - 'for_each_old_connector_in_state'
-  - 'for_each_old_crtc_in_state'
-  - 'for_each_old_mst_mgr_in_state'
-  - 'for_each_oldnew_connector_in_state'
-  - 'for_each_oldnew_crtc_in_state'
-  - 'for_each_oldnew_mst_mgr_in_state'
-  - 'for_each_oldnew_plane_in_state'
-  - 'for_each_oldnew_plane_in_state_reverse'
-  - 'for_each_oldnew_private_obj_in_state'
-  - 'for_each_old_plane_in_state'
-  - 'for_each_old_private_obj_in_state'
-  - 'for_each_online_cpu'
-  - 'for_each_online_node'
-  - 'for_each_online_pgdat'
-  - 'for_each_pci_bridge'
-  - 'for_each_pci_dev'
-  - 'for_each_pci_msi_entry'
-  - 'for_each_pcm_streams'
-  - 'for_each_physmem_range'
-  - 'for_each_populated_zone'
-  - 'for_each_possible_cpu'
-  - 'for_each_present_cpu'
-  - 'for_each_prime_number'
-  - 'for_each_prime_number_from'
-  - 'for_each_process'
-  - 'for_each_process_thread'
-  - 'for_each_prop_codec_conf'
-  - 'for_each_prop_dai_codec'
-  - 'for_each_prop_dai_cpu'
-  - 'for_each_prop_dlc_codecs'
-  - 'for_each_prop_dlc_cpus'
-  - 'for_each_prop_dlc_platforms'
-  - 'for_each_property_of_node'
-  - 'for_each_registered_fb'
-  - 'for_each_requested_gpio'
-  - 'for_each_requested_gpio_in_range'
-  - 'for_each_reserved_mem_range'
-  - 'for_each_reserved_mem_region'
-  - 'for_each_rtd_codec_dais'
-  - 'for_each_rtd_components'
-  - 'for_each_rtd_cpu_dais'
-  - 'for_each_rtd_dais'
-  - 'for_each_set_bit'
-  - 'for_each_set_bit_from'
-  - 'for_each_set_clump8'
-  - 'for_each_sg'
-  - 'for_each_sg_dma_page'
-  - 'for_each_sg_page'
-  - 'for_each_sgtable_dma_page'
-  - 'for_each_sgtable_dma_sg'
-  - 'for_each_sgtable_page'
-  - 'for_each_sgtable_sg'
-  - 'for_each_sibling_event'
-  - 'for_each_subelement'
-  - 'for_each_subelement_extid'
-  - 'for_each_subelement_id'
-  - '__for_each_thread'
-  - 'for_each_thread'
-  - 'for_each_unicast_dest_pgid'
-  - 'for_each_vsi'
-  - 'for_each_wakeup_source'
-  - 'for_each_zone'
-  - 'for_each_zone_zonelist'
-  - 'for_each_zone_zonelist_nodemask'
-  - 'fwnode_for_each_available_child_node'
-  - 'fwnode_for_each_child_node'
-  - 'fwnode_graph_for_each_endpoint'
-  - 'gadget_for_each_ep'
-  - 'genradix_for_each'
-  - 'genradix_for_each_from'
-  - 'hash_for_each'
-  - 'hash_for_each_possible'
-  - 'hash_for_each_possible_rcu'
-  - 'hash_for_each_possible_rcu_notrace'
-  - 'hash_for_each_possible_safe'
-  - 'hash_for_each_rcu'
-  - 'hash_for_each_safe'
-  - 'hctx_for_each_ctx'
-  - 'hlist_bl_for_each_entry'
-  - 'hlist_bl_for_each_entry_rcu'
-  - 'hlist_bl_for_each_entry_safe'
-  - 'hlist_for_each'
-  - 'hlist_for_each_entry'
-  - 'hlist_for_each_entry_continue'
-  - 'hlist_for_each_entry_continue_rcu'
-  - 'hlist_for_each_entry_continue_rcu_bh'
-  - 'hlist_for_each_entry_from'
-  - 'hlist_for_each_entry_from_rcu'
-  - 'hlist_for_each_entry_rcu'
-  - 'hlist_for_each_entry_rcu_bh'
-  - 'hlist_for_each_entry_rcu_notrace'
-  - 'hlist_for_each_entry_safe'
-  - 'hlist_for_each_entry_srcu'
-  - '__hlist_for_each_rcu'
-  - 'hlist_for_each_safe'
-  - 'hlist_nulls_for_each_entry'
-  - 'hlist_nulls_for_each_entry_from'
-  - 'hlist_nulls_for_each_entry_rcu'
-  - 'hlist_nulls_for_each_entry_safe'
-  - 'i3c_bus_for_each_i2cdev'
-  - 'i3c_bus_for_each_i3cdev'
-  - 'ide_host_for_each_port'
-  - 'ide_port_for_each_dev'
-  - 'ide_port_for_each_present_dev'
-  - 'idr_for_each_entry'
-  - 'idr_for_each_entry_continue'
-  - 'idr_for_each_entry_continue_ul'
-  - 'idr_for_each_entry_ul'
-  - 'in_dev_for_each_ifa_rcu'
-  - 'in_dev_for_each_ifa_rtnl'
-  - 'inet_bind_bucket_for_each'
-  - 'inet_lhash2_for_each_icsk_rcu'
-  - 'key_for_each'
-  - 'key_for_each_safe'
-  - 'klp_for_each_func'
-  - 'klp_for_each_func_safe'
-  - 'klp_for_each_func_static'
-  - 'klp_for_each_object'
-  - 'klp_for_each_object_safe'
-  - 'klp_for_each_object_static'
-  - 'kunit_suite_for_each_test_case'
-  - 'kvm_for_each_memslot'
-  - 'kvm_for_each_vcpu'
-  - 'list_for_each'
-  - 'list_for_each_codec'
-  - 'list_for_each_codec_safe'
-  - 'list_for_each_continue'
-  - 'list_for_each_entry'
-  - 'list_for_each_entry_continue'
-  - 'list_for_each_entry_continue_rcu'
-  - 'list_for_each_entry_continue_reverse'
-  - 'list_for_each_entry_from'
-  - 'list_for_each_entry_from_rcu'
-  - 'list_for_each_entry_from_reverse'
-  - 'list_for_each_entry_lockless'
-  - 'list_for_each_entry_rcu'
-  - 'list_for_each_entry_reverse'
-  - 'list_for_each_entry_safe'
-  - 'list_for_each_entry_safe_continue'
-  - 'list_for_each_entry_safe_from'
-  - 'list_for_each_entry_safe_reverse'
-  - 'list_for_each_entry_srcu'
-  - 'list_for_each_prev'
-  - 'list_for_each_prev_safe'
-  - 'list_for_each_safe'
-  - 'llist_for_each'
-  - 'llist_for_each_entry'
-  - 'llist_for_each_entry_safe'
-  - 'llist_for_each_safe'
-  - 'mci_for_each_dimm'
-  - 'media_device_for_each_entity'
-  - 'media_device_for_each_intf'
-  - 'media_device_for_each_link'
-  - 'media_device_for_each_pad'
-  - 'nanddev_io_for_each_page'
-  - 'netdev_for_each_lower_dev'
-  - 'netdev_for_each_lower_private'
-  - 'netdev_for_each_lower_private_rcu'
-  - 'netdev_for_each_mc_addr'
-  - 'netdev_for_each_uc_addr'
-  - 'netdev_for_each_upper_dev_rcu'
-  - 'netdev_hw_addr_list_for_each'
-  - 'nft_rule_for_each_expr'
-  - 'nla_for_each_attr'
-  - 'nla_for_each_nested'
-  - 'nlmsg_for_each_attr'
-  - 'nlmsg_for_each_msg'
-  - 'nr_neigh_for_each'
-  - 'nr_neigh_for_each_safe'
-  - 'nr_node_for_each'
-  - 'nr_node_for_each_safe'
-  - 'of_for_each_phandle'
-  - 'of_property_for_each_string'
-  - 'of_property_for_each_u32'
-  - 'pci_bus_for_each_resource'
-  - 'pcl_for_each_chunk'
-  - 'pcl_for_each_segment'
-  - 'pcm_for_each_format'
-  - 'ping_portaddr_for_each_entry'
-  - 'plist_for_each'
-  - 'plist_for_each_continue'
-  - 'plist_for_each_entry'
-  - 'plist_for_each_entry_continue'
-  - 'plist_for_each_entry_safe'
-  - 'plist_for_each_safe'
-  - 'pnp_for_each_card'
-  - 'pnp_for_each_dev'
-  - 'protocol_for_each_card'
-  - 'protocol_for_each_dev'
-  - 'queue_for_each_hw_ctx'
-  - 'radix_tree_for_each_slot'
-  - 'radix_tree_for_each_tagged'
-  - 'rb_for_each'
-  - 'rbtree_postorder_for_each_entry_safe'
-  - 'rdma_for_each_block'
-  - 'rdma_for_each_port'
-  - 'rdma_umem_for_each_dma_block'
-  - 'resource_list_for_each_entry'
-  - 'resource_list_for_each_entry_safe'
-  - 'rhl_for_each_entry_rcu'
-  - 'rhl_for_each_rcu'
-  - 'rht_for_each'
-  - 'rht_for_each_entry'
-  - 'rht_for_each_entry_from'
-  - 'rht_for_each_entry_rcu'
-  - 'rht_for_each_entry_rcu_from'
-  - 'rht_for_each_entry_safe'
-  - 'rht_for_each_from'
-  - 'rht_for_each_rcu'
-  - 'rht_for_each_rcu_from'
-  - '__rq_for_each_bio'
-  - 'rq_for_each_bvec'
-  - 'rq_for_each_segment'
-  - 'scsi_for_each_prot_sg'
-  - 'scsi_for_each_sg'
-  - 'sctp_for_each_hentry'
-  - 'sctp_skb_for_each'
-  - 'shdma_for_each_chan'
-  - '__shost_for_each_device'
-  - 'shost_for_each_device'
-  - 'sk_for_each'
-  - 'sk_for_each_bound'
-  - 'sk_for_each_entry_offset_rcu'
-  - 'sk_for_each_from'
-  - 'sk_for_each_rcu'
-  - 'sk_for_each_safe'
-  - 'sk_nulls_for_each'
-  - 'sk_nulls_for_each_from'
-  - 'sk_nulls_for_each_rcu'
-  - 'snd_array_for_each'
-  - 'snd_pcm_group_for_each_entry'
-  - 'snd_soc_dapm_widget_for_each_path'
-  - 'snd_soc_dapm_widget_for_each_path_safe'
-  - 'snd_soc_dapm_widget_for_each_sink_path'
-  - 'snd_soc_dapm_widget_for_each_source_path'
-  - 'tb_property_for_each'
-  - 'tcf_exts_for_each_action'
-  - 'udp_portaddr_for_each_entry'
-  - 'udp_portaddr_for_each_entry_rcu'
-  - 'usb_hub_for_each_child'
-  - 'v4l2_device_for_each_subdev'
-  - 'v4l2_m2m_for_each_dst_buf'
-  - 'v4l2_m2m_for_each_dst_buf_safe'
-  - 'v4l2_m2m_for_each_src_buf'
-  - 'v4l2_m2m_for_each_src_buf_safe'
-  - 'virtio_device_for_each_vq'
-  - 'while_for_each_ftrace_op'
-  - 'xa_for_each'
-  - 'xa_for_each_marked'
-  - 'xa_for_each_range'
-  - 'xa_for_each_start'
-  - 'xas_for_each'
-  - 'xas_for_each_conflict'
-  - 'xas_for_each_marked'
-  - 'xbc_array_for_each_value'
-  - 'xbc_for_each_key_value'
-  - 'xbc_node_for_each_array_value'
-  - 'xbc_node_for_each_child'
-  - 'xbc_node_for_each_key_value'
-  - 'zorro_for_each_dev'
-
-#IncludeBlocks: Preserve # Unknown to clang-format-5.0
-IncludeCategories:
-  - Regex: '.*'
-    Priority: 1
-IncludeIsMainRegex: '(Test)?$'
-IndentCaseLabels: false
-#IndentPPDirectives: None # Unknown to clang-format-5.0
-IndentWidth: 8
-IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: false
-MacroBlockBegin: ''
-MacroBlockEnd: ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
-ObjCBlockIndentWidth: 8
-ObjCSpaceAfterProperty: true
-ObjCSpaceBeforeProtocolList: true
-
-# Taken from git's rules
-#PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0
-PenaltyBreakBeforeFirstCallParameter: 30
-PenaltyBreakComment: 10
-PenaltyBreakFirstLessLess: 0
-PenaltyBreakString: 10
-PenaltyExcessCharacter: 100
-PenaltyReturnTypeOnItsOwnLine: 60
-
-PointerAlignment: Right
-ReflowComments: false
-SortIncludes: false
-#SortUsingDeclarations: false # Unknown to clang-format-4.0
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-#SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0
-#SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0
-SpaceBeforeParens: ControlStatements
-#SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles: false
-SpacesInContainerLiterals: false
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Cpp03
-TabWidth: 8
-UseTab: Always
-...

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 # Configuration for Gitlab-CI.
 # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines
 
-image: $CI_REGISTRY/buildroot.org/buildroot/base:20220206.1756
+image: buildroot/base:20200814.2228
 
 stages:
   - generate-gitlab-ci
@@ -11,11 +11,8 @@ generate-gitlab-ci-yml:
   stage: generate-gitlab-ci
   script: ./support/scripts/generate-gitlab-ci-yml support/misc/gitlab-ci.yml.in > generated-gitlab-ci.yml
   artifacts:
-    when: always
     paths:
       - generated-gitlab-ci.yml
-      - br-test-pkg/*/.config
-      - br-test-pkg/*/missing.config
 
 buildroot-pipeline:
   stage: build
@@ -24,5 +21,3 @@ buildroot-pipeline:
       - artifact: generated-gitlab-ci.yml
         job: generate-gitlab-ci-yml
     strategy: depend
-  variables:
-    PARENT_PIPELINE_ID: $CI_PIPELINE_ID

CHANGES

@@ -1,554 +1,3 @@
-2022.02-rc3, released February 28th, 2022
-
-	Fixes all over the tree.
-
-	Defconfigs: Xilinx zynqmp zcu102/zcu106: Fix U-Boot DTS config
-
-	Updated/fixed packages: bluez5_utils, bpftool, dbus, exempi,
-	flac, freerdp, frr, gnutls, libpjsip, libxml2, mariadb,
-	openssh, python-twisted, qt5webkit, samba4, vim, weston,
-	wireshark, wolfssl, xdg-dbus-proxy, xterm,
-
-2022.02-rc2, released February 20th, 2022
-
-	Fixes all over the tree.
-
-	Defconfigs: Friendlyarm Nanopi R2S: Fix U-Boot build, Kontron
-	BL i.MX8M Mini: Fix U-Boot build, PC Engines APU2: Fix Linux
-	build, ROC-RK3399-PC: Bump rootfs size to fix build
-
-	Updated/fixed packages: apache, apparmor, apr-util, arp-scan,
-	binutils, bluez5_utils, connman, cryptsetup, dnsmasq,
-	dovecot-pigeonhole, expat, gdk-pixbuf, gst1-plugins-base,
-	guile, keepalived, kodi, libbpf, libglvnd, libgsasl, libiconv,
-	librsvg, libuhttpd, libusb, libv4l, luasyslog, mongrel2, neon,
-	pcre, perl-netaddr-ip, php, psmisc, python-ipython,
-	python-pycli, python-pygame, python-regex, python-twisted,
-	qt5location, qt5webkit, resiprocate, rygel, safeclib,
-	sdl2_ttf, socketcand, strongswan, sudo, systemd, toolchain,
-	urg, webkitgtk, wireless-regdb, wpewebkit,
-	xdriver_xf86-video-{ati,mach64,mga,r128,savage,tdfx}, xz, zfs,
-	zsh
-
-2022.02-rc1, released February 13th, 2022
-
-	Numerous package updates and many (80) new packages.
-
-	Toolchain:
-	- glibc: Optional support for compatibility shims for running
-          on older kernels than what glibc has been built against
-	- uClibc: Use uClibc-ng 1.0.40
-	- External toolchains: Update Bootlin toolchains to 2021.11-1
-          version
-
-	Python 2.7 and python 2.x specific packages removed as python
-	2.x is EOL since April 2020. Likewise a number of python3
-	specific host packages has been renamed (host-python-foo
-	instead of host-python3-foo) now host-python is always python
-	3.x.
-
-	Cargo (Rust) package infrastructure added. Vendoring support
-	added to golang package infrastructure.
-
-	New defconfigs: FriendlyARM NanoPi R2S, Kontron BL i.MX8M
-	Mini, Microchip Sama7g7ek, Olimex STMP157 OlinuXino LIME2,
-	QEMU PPC Bamboo, PPC64 PowerNV, Raspberry Pi Zero 2W, Spike
-	Riscv64, Xilinx zcu102
-
-	Removed defconfigs: Synopsys arch38 VDK, aarch64 VDK
-
-	New packages: ace, alchemy, alfred, bat, bento4, bmx7,
-	bpftool, brcmfmac_sdio-firmware-rpi, cfm, cups-pk-helper,
-	davinci-bootcount, dbus-cxx, embiggen-disk, freeipmi,
-	gocryptfs, kodi-pvr-plutotv, kodi-pvr-waipu, ksmbd-tools,
-	libcamera-apps, libest, libexecinfo, libfutils, libglvnd,
-	libks, libmd, libopenaptx, libpeas, libshdata, liburing, lilv,
-	lua-argon2, lua-cffi, lua-inotify, lv2, mali-driver,
-	moby-buildkit, modsecurity2, networkd-dispatcher, pahole,
-	php-apcu, php-lua, php-pam, python-argon2-cffi-bindings,
-	python-cssselect2, python-distro, python-fonttools,
-	python-gnupg, python-installer, python-memory-profiler,
-	python-mpd2, python-pep517, python-pydyf, python-pypa-build,
-	python-pyphen, python-tinycss2, python-tomli,
-	python-weasyprint, python-zopfli, qoriq-cadence-dp-firmware,
-	riscv-isa-sim, rockchip-mali, rpi-rgb-led-matrix, sdbus-cpp,
-	sentry-cli, serd, simple-mail, sord, sratom,
-	sunxi-mali-utgard, sunxi-mali-utgard-driver, tinifier, ulog,
-	vulkan-headers, xlib_libxcvt, zabbix, zchunk, zynaddsubfx
-
-	Removed packages: gstreamer1-mm, python, python-backports-abc,
-	python-backports-functools-lru-cache,
-	python-backports-shutil-get-terminal-size,
-	python-backports-ssl-match-hostname, python-configobj,
-	python-dialog, python-enum, python-enum34, python-functools32,
-	python-futures, python-id3, python-ipaddr, python-ipaddress,
-	python-mad, python-nfc, python-pam, python-pathlib2,
-	python-pycap, python-pyro, python-singledispatch,
-	python-subprocess32, python-typing, python-yieldfrom,
-	qt5webkit-examples, rpi-bt-firmware, rpi-wifi-firmware,
-	sunxi-mali-mainline, sunxi-mali-mainline-driver, zynq-boot-bin
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#12271: python-iptables runtime dependencies
-	#13436: PPP 2.4.9 is out
-	#14351: needs to mount sysfs before mount -a
-	#14451: nodejs won't build on Fedora 35
-	#14471: alsa_utils wrong deployment
-	#14501: lttng-modules v2.11 package fails to build
-	#14531: Package EFL - build error
-
-2021.11.2, released February 28th, 2022
-
-	Important / security related fixes.
-
-	Defconfigs: Andes ae3xx, Intel galileo: Fix build with host
-	gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue.
-
-	Add conditional patching logic to fix build issues for older
-	U-Boot / Linux kernel versions when built with a host gcc >=
-	10.
-
-	Updated/fixed packages: apitrace, binutils, casync, cgilua,
-	connman, expat, gauche, gdb, gensio, glibc, go, gst-omx,
-	gst1-devtools, gst1-libav, gst1-plugins-bad,
-	gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly,
-	gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1,
-	gstreamer1-editing-services, kf5-extra-cmake-modules, kodi,
-	libarchive, linux, lm-sensors, localedef, log4cxx, mpd,
-	nfs-utils, php, pistache, pkcs11-helper, prosody,
-	python-django, python-pyzmq, python-regex,
-	python-sqliteschema, resiprocate, rtl8723bu, thermald, tiff,
-	tor, util-linux, vim, xen
-
-2021.11.1, released January 29th, 2022
-
-	Important / security related fixes.
-
-	check-package: Improve variable override check
-
-	pkg-stats: List CVEs where the version info cannot be parsed
-	as unsure rather than completely ignoring them.
-
-	Defconfigs: Beaglebone: Support BeagleBone black wireless,
-	stm32f469_xip_disco: Fix kernel boot
-
-	Updated/fixed packages: alsa-utils, apache, binutils, cage,
-	capnproto, civetweb, clamav, collectd, connman, containerd,
-	coreutils, dav1d, docker-cli, docker-engine, erlang,
-	erlang-rebar, expat, findutils, flare-engine, flare-game,
-	font-awesome, freeswitch, gcc, ghostscript, glibc, gnuchess,
-	go, grpc, gst1-interpipe, gst1-rtsp-server, gupnp-tools,
-	hackrf, icu, imagemagick, janus-gateway, json-for-modern-cpp,
-	keepalived, lapack, libdbi, libiio, libjpeg, libmbim, libnss,
-	libopenssl, libpjsip, libqmi, liburiparser, libvirt,
-	linux-pam, lxc, mbedtls, mender, mongodb, mpd-mpc, mutt,
-	nodejs, openblas, pcre2, php, pipewire, polkit, privoxy,
-	prosody, python-charset-normalizer, python-django,
-	python-idna, python-lxml, python-pyqt5, python-requests,
-	python-urllib3, python3, qt5base, qt5location, rhash,
-	rng-tools, ruby, runc, rustc, samba4, sofia-sip, targetcli-fb,
-	tcpreplay, tinyxml, tor, tpm2-tss, util-linux-libs, vim, vlc,
-	wireshark, xapp_xauth, xapp_xinput-calibrator, xen, xenomai,
-	xlib_libX11, xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14451: nodejs won't build on Fedora 35
-	#14471: alsa_utils wrong deployment
-
-2021.11, released December 5th, 2021
-
-	Various fixes.
-
-	Defconfigs: Grinn chiliboard/liteboard, PC x86-64 bios: Fix
-	build
-
-	Updated/fixed packages: apr, coreutils, diffutils, e2fsprogs,
-	exfat, freeswitch, gnupg, grub2, gstreamer1, guile, heimdal,
-	hiawatha, hplip, icu, janus-gateway,
-	kodi-screensaver-asterwave, kodi-screensaver-cpblobs,
-	kodi-screensaver-matrixtrails, libatomic_ops, libbson, libffi,
-	libgdiplus, libgee, libhtp, libite, libnspr, libnss,
-	libunwind, lynx, mender-grubenv, mkpasswd, motion, mxml,
-	netdata, qemu, samba4, speex, stress-ng, tinydtls, unixodbc,
-	unrar, util-linux, util-linux-libs, watchdogd, wireshark
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14351: needs to mount sysfs before mount -a
-	#14411: 2021.11-rc2: Samba doesn't compile
-
-2021.11-rc3, released November 30th, 2021
-
-	Fixes all over the tree.
-
-	Defconfigs: Nitrogen8mp: Fix Linux build, Zynqmp-zxu106: Fix
-	ATF build
-
-	Updated/fixed packages: asterisk, automake, gdb, glorytun,
-	gmp, hackrf, libgee, libglib2, libmodsecurity, libosmium,
-	libressl, lighttpd, linux, micropython, mosquitto, mtd,
-	nfs-utils, nss-myhostname, pcre, php, poco, pure-ftpd,
-	python-cycler, qemu, qdecoder, smack, smcroute, spidev_test,
-	strace, syslinux, toolchain, uboot, uhd, vim, websocketpp,
-	wireshark, xcursor-transparent-theme, xscreensaver,
-	xtables-addons
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14346: BR2_PACKAGE_NFS_UTILS_RPC_NFSD does not patch CONFIG_NFSD..
-
-2021.11-rc2, released November 19th, 2021
-
-	Fixes all over the tree.
-
-	Coding style fixes for a large number of board genimage
-	configuration files for clarity and consistency.
-
-	Defconfigs: Acmesystems Aria/Arietta g25, Armadeus
-	apf28/apf51, beagleboneai, Olimx a64, rock64, sheevaplug: Fix
-	build with hostcc >= 10, Nezha: Correct U-Boot dependencies
-
-	Updated/fixed packages: alsa-lib, apparmor, binutils,
-	bluez5_utils, botan, diffutils, firmware-utils, gdb, glmark2,
-	glog, gpu-amd-bin-mx51, gst1-interpipe, imx-vpuwrap, iperf,
-	isl, janet, libdnet, libglib2, libhtp, liburcu, log4cxx,
-	luajit, luvi, meson, mksh, mongodb, mosquitto, mpd, mupdf,
-	opencv4, oracle-mysql, pipewire, postgresql, python-aiohttp,
-	python-pudb, python-ujson, qhull, samba4, seatd, sg3_utils,
-	suricata, tpm2-tss, uboot, vim, xserver_xorg-server
-
-	New packages: pipewire-media-session
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	14311: Cannot compile dahdi (part of Asterisk) for x86 (P1mmx)
-
-2021.11-rc1, released November 8th, 2021
-
-	Numerous package updates. Notable updates including numerous
-	Python modules, Kodi add-ons, nodejs, OpenJDK.
-
-	Toolchain:
-	- glibc update to 2.34
-	- support for gdb 11.x added, gdb 10.x now the default
-	- external toolchains provided by ARM updated
-	- remove support for internal toolchain on the CSKY
-          architecture, as it was broken and unmaintained
-
-	Many packages updated to enable the appropriate SELinux
-	refpolicy module when SELinux support is enabled.
-
-	Support was added in the test-pkg package testing utility for
-	using Gitlab CI to run the builds.
-
-	New libgbm virtual package to better support OpenGL
-	implementations that provide a libgbm library.
-
-	Bootloaders/firmware: grub2 extended to be able to support
-	multiple platforms in the same build.
-
-	Filesystems:
-	- new OCI filesystem type, to build container images
-	  compatible with the Open Container Initiative standard
-	- support for hybrid ISO9660 images added, which work on
-          legacy and EFI BIOS machines
-
-	New defconfigs: Allwinner nezha, stm32mp157c_odyssey
-
-	Removed defconfigs: qemu_csky
-
-	New packages: dtbocfg, firmware-utils, gstd, libdbi,
-	libdbi-drivers, libteam, lua-augeas, mstpd, php-pecl-dbus,
-	python-aioprocessing, python-bidict,
-	python-charset-normalizer, python-flask-expects-json,
-	python-git, python-pyndiff, python-rsa,
-	python-unitest-xml-reporting, python-xmljson,
-	python3-cryptography, python3-pip, qt5opcua, rwmem,
-	sloci-image, softhsm2, sun20i-d1-spl, uqmi, vuejs-router,
-	watchdogd, wireplumber
-
-	Removed packages: canfestival, python-meld3
-
-	Work toward the removal of python 2 has progressed: many
-	python modules and packages have been updated to a version
-	supporting python 3.
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14271: compilation error with rsync command for  permission
-	#14276: Unable to get login prompt
-	#14196: when using raspberrypicm4io_64_defconfig, make fails
-	        with mkfs.ext4: No such file or directory while trying
-	        to determine filesystem size
-
-2021.08.3, released December 13th, 2021
-
-	Important / security related fixes.
-
-	Defconfigs: Various fixes for building with gcc >= 10 host or
-	target compilers.
-
-	Updated/fixed packages: alsa-lib, apparmor, apr, asterisk,
-	binutils, bluez5_utils, coreutils, e2fsprogs, exfat,
-	freeswitch, gdb, glmark2, glog, glorytun, gmp,
-	gpu-amd-bin-mx51, gst1-interpipe, gstreamer1, guile, gupnp,
-	hackrf, heimdal, hiawatha, hplip, icu, imx-vpuwrap, isl,
-	janus-gateway, libatomic_ops, libbson, libdnet, libffi,
-	libgdiplus, libgee, libglib2, libhtp, libmodsecurity, libnspr,
-	libnss, libosmium, libunwind, linux, lynx, meson, micropython,
-	mkpasswd, mksh, mosquitto, motion, mupdf, mxml, netdata,
-	nfs-utils, opencv4, oracle-mysql, pcre, php, postgresql,
-	pure-ftpd, python-cycler, qdecoder, rcw-smarc-sal28, samba4,
-	smack, speex, stress-ng, suricata, syslinux, uboot, unixodbc,
-	unrar, vim, websocketpp, wireshark
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14346: BR2_PACKAGE_NFS_UTILS_RPC_NFSD does not patch CONFIG_NFSD..
-
-2021.08.2, released November 10th, 2021
-
-	Important / security related fixes.
-
-	Updated/fixed packages: asterisk, audit, bind, bitcoin,
-	containerd, cryptsetup, dahdi-linux, dbus-python, dfu-util,
-	docker-cli, docker-engine, earlyoom, edk2-platforms, exiv2,
-	ffmpeg, freerdp, gdb, gensio, gnupg2, go, gpsd,
-	gst1-plugins-bad, gst1-plugins-ugly, gst1-vaapi, gtest,
-	hiredis, lftp, libps1, libva, libva-utils, lightning,
-	log4cplus, lrzip, netdata, nodejs, olsr, openjdk, openjdk-bin,
-	pango, php, python3-cffi, qemu, refpolicy, rng-tools, samba4,
-	snort, strongswan, sunxi-mali-mainline-driver, suricata,
-	systemd, tor, vim, weston, wf111, wireguard-linux-compat,
-	xerces
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14311: Cannot compile dahdi (part of Asterisk) for x86 (P1mmx)
-
-2021.08.1, released October 11, 2021
-
-	Important / security related fixes.
-
-	gdbinit: Mark the sysroot as a "safe path" before configuring
-	it, so pretty printers work correctly without having to pass
-	-ix to gdb
-
-	Updated/fixed packages: alsa-lib, apache,
-	arm-trusted-firmware, atftp, bind, botan, cog, containerd,
-	cryptopp, docker-cli, dash, dc3dd, docker-engine, dovecot,
-	environment-setup, erlang, fetchmail, ffmpeg, fio, gcc, gd,
-	gdb, ghostscript, gnuradio, gnutils, go,
-	gobject-introspection, google-breakpad, gst-omx,
-	gst1-devtools, gst1-interpipe, gst1-libav, gst1-plugins-bad,
-	gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly,
-	gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1,
-	gstreamer1-editing-services, gupnp, haproxy, imlib2, kodi,
-	kodi-pvr-octonet, kodi-visualisation-fishbmc, libcurl,
-	libexif, libgcrypt, libglib2, libkrb5, libressl, librsvg,
-	libsndfile, libssh, libvirt, libxcrypt, libyang, links, lvm2,
-	lynx, lxc, mc, mesa3d, micropython, minicom, mono, mosquitto,
-	mtr, mupdf, mv-ddr-marvell, net-tools, nginx-dav-ext, nmap,
-	nodejs, ntfs-3g, openjdk, openjdk-bin, openldap, openssh,
-	pcre2, php, php-gnupg, pipewire, postgis, python-aioconsole,
-	python-cbor2, python-cffi, python-cython, python-dateutil,
-	python-django, python-pillow, python-pip, python-texttable,
-	python-urllib3, python-webob, qemu, qt5location, redis,
-	refpolicy, ripgrep, ruby, runc, sispmctl, sox, squid,
-	strongswan, supervisor, swupdate, syslinux, systemd, tinycbor,
-	trace-cmd, uboot-tools, uclibc, udisks, uhd, vim, vsftpd,
-	wavemon, webkitgtk, wget, wireless-regdb, wpewebkit,
-	xapp_xrdb, xapp_xwd, xen, xlib_libXfont2, xlib_libXft,
-	xserver_xorg-server, zip
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14206: Kodi: even when not enabled, forcefully selects libevdev..
-	#14211: libffi-3.3.tar.gz repacked
-	#14221: mv-ddr-marvell fails license validation
-
-2021.08, released September 4th, 2021
-
-	Various fixes.
-
-	Updated/fixed packages: gstreamer1-mm, netsniff-ng, nginx,
-	openmpi, python-pyudev, python3, qt5base, wlroots, xvisor
-
-2021.08-rc3, released August 31st, 2021
-
-	Fixes all over the tree.
-
-	Toolchain: Disable fortify support for Microblaze as it is not
-	currently working.
-
-	Defconfigs: Acmesystems aria/ariette g25: Fix build issue
-	after at91bootstrap bump, BeagleV: Correct kernel headers
-	version, PC x86-64: Bump kernel to 4.19.204 to fix build issue
-	with GCC 10.x.
-
-	Updated/fixed packages: alsa-utils, at91bootstrap3, belle-sip,
-	bullet, c-ares, cjson, coreutils, cpio, eigen, fetchmail, gdb,
-	haproxy, heirloom-mailx, ipmiutil, kvm-unit-tests, libarchive,
-	libffi, libmodsecurity, libopenssl, libressl, libshout,
-	libvirt, linux-pam, lmbench, localedef, lua-lunix, mesa3d,
-	mpv, mtd, nodejs, nvidia-driver, openvmtools, php, polkit,
-	python-requests, python3-requests, rust-bin, rustc, samba4,
-	sdl2, snort3, ushare, xen
-
-	Removed packages: libmcrypt, mcrypt, sentry-cli
-
-2021.08-rc2, released August 18th, 2021
-
-	Fixes all over the tree.
-
-	Defconfigs: Acmesystems acqua a5: Bump at91bootstrap version
-	to fix build issue with binutils >= 2.35, Microchip sam9x60ek
-	mmc_dev: Add missing toolchain/system options, sama5d2-icp
-	mmc: Correct at91bootstrap options
-
-	Updated/fixed packages: arm-trusted-firmware, at91bootstrap3,
-	azure-iot-sdk-c, bluez5_utils, bullet, busybox, cegui, efl,
-	erlang, ffmpeg, flatbuffers, fontconfig, gcc, gd, glibc, go,
-	gobject-introspection, gpsd, guile, harfbuzz, iozone, iputils,
-	jszip, libargtable2, libbpf, libebml, libepoxy, libesmtp,
-	libfuse3, libgeos, libnss, libodb-boost, libodb-mysql,
-	libodb-pgsql, libqmi, libqrtr-glib, libuhttpd, libuwsc,
-	libvirt, ltp-testsuite, luaossl, mongodb, mpd, mupdf, mutt,
-	network-manager, nginx-naxsi, nodejs, ogre, openzwave,
-	optee-os, osm2pgsql, pdbg, perl-net-ssh2, php, pipewire,
-	pistache, pixman, poke, polkit, poppler, postgresql, postkit,
-	prelink-cross, prosody, protobuf, pulseview,
-	python-cryptography, python-keyring, python-matplotlib,
-	python-pymupdf, python-pyopenssl, python-secretstorage,
-	python-treq, python-txtorcon, python3, qemu, qpdf, qt5base,
-	refpolicy, ruby, rust-bin, s390-tools, sconeserver, seatd,
-	shairport-sync, sox, sqlite, sylpheed, sysdig, syslog-ng,
-	system-config-printer, tar, terminology, tor, tpm2-tools, uhd,
-	unbound, usbguard, wireshark, xen, xenomai, xlib_libxshmfence,
-	zstd
-
-	New packages: desktop-file-utils
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13586: grub failure with BR2_OPTIMIZE_3
-	#13671: openSSH server closes connection before authentication..
-
-2021.08-rc1, released August 3rd, 2021
-
-	Numerous package updates.
-
-	Toolchain:
-
-        - add support for gcc 11.x, gcc 10.x is now the default, gcc
-	  9.x updated to 9.4.0, removed gcc 8.x support except for
-	  PowerPC SPE
-
-	- add support for binutils 2.37, binutils 2.36.x is now the
-          default, binutils 2.34 removed.
-
-	- glibc updated to 2.33
-
-        - gdb enabled on NIOS II, gdbserver enabled on RISC-V.
-
-	Bootloaders/firmware: support for building the EDK II UEFI
-	firmware, support for building AT91Bootstrap 4.x.
-
-	New BR2_ENABLE_RUNTIME_DEBUG option, that controls whether
-	packages should be compiled with runtime debugging
-	information (which is different than debugging symbols).
-
-	Many features of the bluez5_utils package have been made
-	optional, and default to disabled. Users of bluez5_utils are
-	encouraged to review their configuration.
-
-	Many packages (over 70) updated to enable the appropriate
-	SELinux refpolicy module when SELinux support is enabled.
-
-	Many packages updated to select the appropriate OpenSSL
-	features after many OpenSSL ciphers/features have been made
-	optional.
-
-	New defconfigs: kontron_pitx_imx8m, microchip_sama5d2_icp,
-	qemu_aarch64_sbsa, raspberrypicm4io, raspberrypicm4io_64,
-	terasic_de10nano_cyclone5, uevm5432.
-
-	New packages: alsa-plugins, apg, bmap-tools, daq3, edk2,
-	edk2-platforms, gumbo-parser, libbpf, libosmium, libpsl,
-	libqb, libtalloc, libvirt, lua-linux, lua-zlib, mupdf,
-	opencv4, osm2pgsql, poke, python-augeas, python-dbus-next,
-	python-pymupdf, rtl_433, rtl8812au-aircrack-ng, seatd, snort3,
-	system-config-printer, usbguard, xml-security-c, xmrig.
-
-	Removed packages: clapack, libsoil.
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13326: regarding dtc error in buildroot source code
-	#13661: host-python2 build fails on aarch64
-	#13836: package build failure when target install set to no on
-	        pkg-generic pkg types
-	#13846: BR2_PACKAGE_LVM2_STANDARD_INSTALL should be default to
-	        y as before
-
-2021.05.3, released October 11, 2021
-
-	Important / security related fixes.
-
-	gdbinit: Mark the sysroot as a "safe path" before configuring
-	it, so pretty printers work correctly without having to pass
-	-ix to gdb
-
-	Updated/fixed packages: alsa-lib, apache,
-	arm-trusted-firmware, atftp, bind, botan, containerd,
-	cryptopp, dash, dc3dd, docker-cli, docker-engine, dovecot,
-	erlang, fetchmail, ffmpeg, gdb, ghostscript, go, gst-omx,
-	gst1-devtools, gst1-interpipe, gst1-libav, gst1-plugins-bad,
-	gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly,
-	gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1,
-	gstreamer1-editing-services, kodi, kodi-pvr-octonet,
-	kodi-visualisation-fishbmc, libcurl, libkrb5, libressl,
-	libsndfile, libxcrypt, libyang, lxc, lynx, mesa3d,
-	micropython, minicom, mono, mtr, mv-ddr-marvell, net-tools,
-	nmap, nodejs, ntfs-3g, openjdk, openjdk-bin, openldap,
-	openssh, pcre2, php, python-aioconsole, python-cffi,
-	python-dateutil, python-django, python-pip, python-texttable,
-	python-urllib, python-webob, qt5location, redis, refpolicy,
-	ripgrep, runc, sispmctl, squid, strongswan, supervisor,
-	syslinux, tinycbor, trace-cmd, uboot-tools, uclibc, wavemon,
-	wget, wireless-regdb, xen, xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14206: Kodi: even when not enabled, forcefully selects libevdev..
-	#14211: libffi-3.3.tar.gz repacked
-	#14221: mv-ddr-marvell fails license validation
-
-2021.05.2, released September 15th, 2021
-
-	Important / security related fixes.
-
-	Toolchain: Disable fortify support for Microblaze as it is not
-	currently working.
-
-	Updated/fixed packages: alsa-utils, arm-trusted-firmware,
-	bayer2rgb-neon, belle-sip, bullet, busybox, c-ares, cjson,
-	coreutils, cpio, eigen, environment-setup, fetchmail, ffmpeg,
-	fontconfig, gd, gdb, gnuradio, gnutls, go, haproxy, ipmiutil,
-	iputils, jszip, kvm-unit-tests, libarchive, libargtable2,
-	libexif, libgcrypt, libmodsecurity, libopenssl, librsvg,
-	libshout, libssh, libxcrypt, linux, linux-pam, localedef, mc,
-	mesa3d, mosquitto, netsniff-ng, nginx, nodejs, ogre, openjdk,
-	openmpi, openvmtools, perl-net-ssh2, php, pipewire,
-	postgresql, prelink-cross, prosody, protobuf, python-keyring,
-	python-matplotlib, python-pillow, python-pyudev,
-	python-secretstorage, python3, qt5base, samba4, sdl2, sox,
-	swupdate, sylpheed, tar, terminology, tor, uboot-tools, uhd,
-	unbound, ushare, vim, wlroots, xapp_xrdb, xapp_xwd, xen,
-	xenomai, xlib_libXfont2, xlib_libXft, zip
-
 2021.05.1, released August 10, 2021
 
 	Important / security related fixes.
@@ -747,249 +196,6 @@
 	#13751: libopenssl (static): huge drop in performance in newer ..
 	#13771: package htop has undeclared dependency on host python
 
-2021.02.10, released February 28th, 2022
-
-	Important / security related fixes.
-
-	Defconfigs: Andes ae3xx, Intel galileo: Fix build with host
-	gcc >= 10, ROC-RK3399-PC: Bump rootfs size to fix build issue.
-
-	Add conditional patching logic to fix build issues for older
-	U-Boot / Linux kernel versions when built with a host gcc >=
-	10.
-
-	Updated/fixed packages: casync, cgilua, connman, expat,
-	gauche, gensio, go, gst-omx, gst1-devtools, gst1-libav,
-	gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good,
-	gst1-plugins-ugly, gst1-python, gst1-rtsp-server, gst1-vaapi,
-	gstreamer1, gstreamer1-editing-services,
-	kf5-extra-cmake-modules, kodi, libarchive, linux, lm-sensors,
-	log4cxx, mpd, nfs-utils, pistache, prosody, python-django,
-	python-pyzmq, rtl8723bu, thermald, tiff, util-linux, vim, xen
-
-2021.02.9, released January 29th, 2022
-
-	Important / security related fixes.
-
-	check-package: Improve variable override check
-
-	pkg-stats: List CVEs where the version info cannot be parsed
-	as unsure rather than completely ignoring them.
-
-	Defconfigs: Beaglebone: Support BeagleBone black wireless
-
-	Updated/fixed packages: alsa-utils, apache, cage, capnproto,
-	civetweb, clamav, collectd, connman, coreutils, dav1d,
-	docker-cli, docker-containerd, docker-engine, expat,
-	findutils, flare-engine, flare-game, font-awesome, freeswitch,
-	gcc, ghostscript, gnuchess, go, grpc, gst1-interpipe,
-	gst1-plugins-bad, gst-rtsp-sever, gupnp-tools, hackrf, icu,
-	imagemagick, janus-gateway, keepalived, lapack, libjpeg,
-	libopenssl, libpjsip, liburiparser, linux-pam, lxc, mbedtls,
-	mongodb, mpd-mpc, nodejs, openblas, pcre2, polkit, poppler,
-	privoxy, prosody, python-django, python-lxml, python-pyqt5,
-	python3, qt5base, qt5location, rhash, ruby, runc, samba4,
-	sofia-sip, targetcli-fb, tcpreplay, tinyxml, vim, vlc,
-	wireshark, xapp_xauth, xen, xlib_libX11, xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14471: alsa_utils wrong deployment
-
-2021.02.8, released December 14th, 2021
-
-	Important / security related fixes.
-
-	Defconfigs: Various fixes for building with gcc >= 10 host or
-	target compilers.
-
-	Updated/fixed packages: alsa-lib, apparmor, apr, asterisk,
-	binutils, bluez5_utils, busybox, coreutils, e2fsprogs, ell,
-	exfat, freeswitch, gdb, glmark2, glog, glorytun, gmp,
-	gpu-amd-bin-mx51, gst1-interpipe, gstreamer1, guile, gupnp,
-	hackrf, heimdal, hiawatha, hplip, icu, imx-vpuwrap, isl, iwd,
-	janus-gateway, libatomic_ops, libbson, libdnet, libffi,
-	libgdiplus, libgee, libhtp, libmodsecurity, libnspr, libnss,
-	libunwind, linux, lynx, meson, micropython, mkpasswd, mksh,
-	mosquitto, motion, mxml, netdata, nfs-utils, oracle-mysql,
-	pcre, pkcs11-helper, postgresql, pure-ftpd, python-cycler,
-	qdecoder, rcw-smarc-sal28, samba4, smack, speex, stress-ng,
-	suricata, syslinux, uboot, unixodbc, unrar, vim, websocketpp,
-	wireshark
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14346: BR2_PACKAGE_NFS_UTILS_RPC_NFSD does not patch CONFIG_NFSD..
-
-2021.02.7, released November 10th, 2021
-
-	Important / security related fixes.
-
-	OpenJDK 16.x moved to 17.x as 16.x is EOL.
-
-	Updated/fixed packages: asterisk, audit, bind, bitcoin,
-	cryptsetup, dahdi-linux, dbus-python, dfu-util, docker-cli,
-	docker-containerd, docker-engine, earlyoom, exiv2, ffmpeg,
-	freerdp, gdb, gensio, gnupg2, go, gpsd, gst1-plugins-bad,
-	gst1-plugins-ugly, gst1-vaapi, hiredis, lftp, lightning,
-	lrzip, netdata, nodejs, olsr, openjdk, openjdk-bin, pango,
-	qemu, samba4, snort, strongswan, suricata, systemd, vim,
-	wf111, wireguard-linux-compat, xerces
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14311: Cannot compile dahdi (part of Asterisk) for x86 (P1mmx)
-
-2021.02.6, released October 11, 2021
-
-	Important / security related fixes.
-
-	gdbinit: Mark the sysroot as a "safe path" before configuring
-	it, so pretty printers work correctly without having to pass
-	-ix to gdb
-
-	Updated/fixed packages: alsa-lib, apache,
-	arm-trusted-firmware, atftp, bind, botan, cryptopp, dash,
-	dc3dd, docker-cli, docker-containerd, docker-engine, dovecot,
-	erlang, fetchmail, gdb, ghostscript, go, gst-omx,
-	gst1-devtools, gst1-interpipe, gst1-libav, gst1-plugins-bad,
-	gst1-plugins-base, gst1-plugins-good, gst1-plugins-ugly,
-	gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1,
-	gstreamer1-editing-services, kodi-pvr-octonet, libcurl,
-	libkrb5, libressl, libsndfile, libyang, lxc, lynx, mesa3d,
-	micropython, minicom, mono, mtr, mv-ddr-marvell, net-tools,
-	nmap, nodejs, ntfs-3g, openjdk, openjdk-bin, openldap,
-	openssh, php, python-aioconsole, python-cffi, python-dateutil,
-	python-django, python-pip, python-texttable, python-urllib3,
-	python-webob, qt5location, redis, refpolicy, ripgrep, runc,
-	sispmctl, squid, strongswan, supervisor, syslinux, tinycbor,
-	trace-cmd, uboot-tools, uclibc, wavemon, wireless-regdb, xen,
-	xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14206: Kodi: even when not enabled, forcefully selects libevdev..
-	#14211: libffi-3.3.tar.gz repacked
-	#14221: mv-ddr-marvell fails license validation
-
-2021.02.5, released September 15th, 2021
-
-	Important / security related fixes.
-
-	Toolchain: Disable fortify support for Microblaze as it is not
-	currently working.
-
-	Updated/fixed packages: alsa-utils, arm-trusted-firmware,
-	bayer2rgb-neon, belle-sip, busybox, c-ares, cjson, coreutils,
-	cpio, eigen, environt-setup, fetchmail, fluidsynth,
-	fontconfig, gd, gdb, gnuradio, gnutls, go, haproxy, ipmiutil,
-	iputils, jszip, kvm-unit-tests, libarchive, libexif,
-	libgcrypt, libmodsecurity, libopenssl, librsvg, libshout,
-	libssh, linux, localedef, mc, mesa3d, mosquitto, netsniff-ng,
-	nginx, nodejs, ogre, openmpi, openvmtools, php, postgresql,
-	prelink-cross, prosody, protobuf, python-keyring,
-	python-matplotlib, python-pillow, python-pyudev,
-	python-secretstorage, python3, qt5base, samba4, sdl2, sox,
-	swupdate, sylpheed, tor, uboot-tools, uhd, unbound, vim,
-	wlroots, xapp_xrdb, xapp_xwd, xen, xenomai, xlib_libXfont2,
-	xlib_libXft, zip
-
-2021.02.4, released August 10th, 2021
-
-	Important / security related fixes.
-
-	Toolchain: Disable PIC/PIE for Microblaze (like for NIOS II)
-	as it is not currently working.
-
-	binutils: fix linker assert failure on OpenRisc, or1k build
-	issue with gcc < 5
-
-	gdb: Enable on NIOS II
-
-	utils/scanpypi: Various improvements
-
-	Defconfigs: stm32f469_disco: Fix kernel boot issue, Microchip
-	sam9x60ek mmc_dev: Add missing toolchain/system options
-
-	Updated/fixed packages: apache, arm-trusted-firmware, audit,
-	avahi, bind, binutils, bird, bluez5_utils, boinc, busybox,
-	chrony, clamav, cryptsetup, cwiid, dnsmasq, docker-cli,
-	docker-engine, dovecot, dovecot-pigeonhole, e2fsprogs, exiv2,
-	fail2ban, fb-test-app, feh, fetchmail, flac, fluxbox, gawk,
-	gcc, gcr, gdb, gdk-pixbuf, gesftpserver, glibc, go, gptfdisk,
-	granite, grub2, gqrx, guile, hdparm, heirloom-mailx,
-	ibrcommon, ibrdtn, ibrdtn-tools, ibrdtnd, intel-microcode,
-	iodine, irqbalance, keepalived, libass, libconfig, libcurl,
-	libfreeimage, libfuse3, libgcrypt, libgtk3, libgudev, libhtp,
-	libjson, libkrb5, libloki, libmodsecurity, libndp,
-	libnetfilter-log, libnfnetlink, libnice, libodb, libodb-boost,
-	libodb-mysql, libodb-pgsql, libpcap, libqmi, libressl,
-	librsvg, libtasn1, libtirpc, libuci, libxmlrpc,
-	linux-firmware, linuxptp, lrzsz, ltp-testsuite, lvm2, mariadb,
-	mbedtls, monit, mono, mosquitto, mpd, mpg123, mpv, nbd, neard,
-	netsnmp, nettle, nginx-modsecurity, nmap, nodejs, ntp,
-	openntpd, openpgm, openswan, pango, pcre2,
-	perl-crypt-openssl-rsa, php, pixman, polkit, postgresql,
-	proxychains-ng, putty, python, python-django,
-	python-dataproperty, python-pysftp, python-urllib3, python3,
-	qpdf, redis, ripgrep, ruby, samba4, spice, slirp, suricata,
-	sysdig, tcpdump, tftpd, thrift, tor, tpm2-tools, trinity,
-	uboot, uboot-tools, uclibc, util-linux, vlc, wireless-regdb,
-	wireshark, wolfssl, xapp_fonttosfnt, xlib_libX11,
-	xlib_libxshmfence, xserver_xorg-server
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13586: grub failure with BR2_OPTIMIZE_3
-	#13661: host-python2 build fails on aarch64
-	#13836: package build failure when target install set to no..
-	#13846: BR2_PACKAGE_LVM2_STANDARD_INSTALL should be default to..
-
-2021.02.3, released June 12th, 2021
-
-	Important / security related fixes.
-
-	CPE meta data has been added for a large number of packages
-
-	Updated/fixed packages: acpid, apache, apcupsd, assimp, bird,
-	bitcoin, blktrace, boost, capnproto, chrony, dc3dd, dhcp,
-	directfb, dmalloc, docker-engine, ebtables, efibootmgr,
-	enlightenment, enscript, environment-setup, exempi, expat,
-	findutils, flatcc, fluidsynth, frr, gdb, go, gptfdisk, grpc,
-	gst1-plugins-bad, gst1-rtsp-server, gstreamer1, gupnp,
-	hostapd, hwloc, i2c-tools, iftop, imagemagick, imx-gpu-viv,
-	intel-mediadriver, intel-microcode, jquery-validation,
-	keepalived, kodi, less, libcamera, libcurl, libcutl, libesmtp,
-	libeXosip2, libffi, libfuse, libfuse3, libgeos, libgtk2,
-	libgtk3, libical, libidn, libidn2, libkcapi, libldns, libmms,
-	libmodbus, libmspack, libnids, libopenh264, liboping, libraw,
-	librelp, libsamplerate, libtirpc, libusb, libuv, libxcb,
-	libxml2, libxslt, live555, llvm, lmbench, localedef,
-	lttng-tools, lvm2, lz4, mesa3d, mimic, mini-snmpd, minidlna,
-	minissdpd, minizip, mono-gtksharp3, mpg123, mpv, msmtp, musl,
-	mutt, nasm, nbd, netperf, netsurf, nginx, odb, opencv3,
-	openssh, opentyrian, oprofile, p7zip, paho-mqtt-c, perl,
-	php-imagick, pifmrds, picocom, pigz, pngquant, poco,
-	postgresql, prosody, proxychains-ng, pulseaudio, putty, pwgen,
-	python-autobahn, python-bluezero, python-engineio,
-	python-keyring, python-pillow, python-requests, python-tqdm,
-	qemu, qpdf, qt5base, redis, refpolicy, rt-tests, runc,
-	shellinabox, squid, strace, supervisor, synergy, taglib,
-	tclap, terminology, thermald, tini, tinyproxy, tinyxml2,
-	tpm2-tss, uclibc, udisks, uhd, unscd, vlc, waylandpp,
-	webkitgtk, weston, wireshark, wpa_supplicant, wpewebkit,
-	xlib_libdmx, xlib_libFS, xlib_libICE, xlib_libX11,
-	xlib_libXcursor, xlib_libXdmcp, xlib_libXext, xlib_libXfixes,
-	xlib_libXfont2, xlib_libXinerama, xlib_libXpm, xlib_libXres,
-	xlib_libXt, xlib_libXtst, xlib_libXxf86dga, xlib_libXxf86vm,
-	xterm
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13781: isc dhcp-server package don't create file /usr/bin/dhcpd
-	#13801: toolchainfile.cmake CMAKE_BUILD_TYPE
-	#13806: Building host-localedef fails on fedora 34/gcc 11
-
 2021.02.2, released May 12th, 2021
 
 	Important / security related fixes.

Config.in

@@ -119,10 +119,6 @@ config BR2_SCP
 	string "Secure copy (scp) command"
 	default "scp"
 
-config BR2_SFTP
-	string "Secure file transfer (sftp) command"
-	default "sftp"
-
 config BR2_HG
 	string "Mercurial (hg) command"
 	default "hg"
@@ -416,19 +412,6 @@ config BR2_DEBUG_3
 endchoice
 endif
 
-config BR2_ENABLE_RUNTIME_DEBUG
-	bool "build packages with runtime debugging info"
-	help
-	  Some packages may have runtime assertions, extra traces, and
-	  similar runtime elements that can help debugging. However,
-	  these elements may negatively influence performance so should
-	  normally not be enabled on production systems.
-
-	  Enable this option to enable such runtime debugging.
-
-	  Note: disabling this option is not a guarantee that all
-	  packages effectively removed these runtime debugging elements.
-
 config BR2_STRIP_strip
 	bool "strip target binaries"
 	default y
@@ -857,16 +840,9 @@ endchoice
 comment "RELocation Read Only (RELRO) needs shared libraries"
 	depends on !BR2_SHARED_LIBS
 
-config BR2_FORTIFY_SOURCE_ARCH_SUPPORTS
-	bool
-	default y
-	# Microblaze glibc toolchains don't work with Fortify Source enabled
-	depends on !BR2_microblaze
-
 choice
 	bool "Buffer-overflow Detection (FORTIFY_SOURCE)"
 	default BR2_FORTIFY_SOURCE_1
-	depends on BR2_FORTIFY_SOURCE_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on !BR2_OPTIMIZE_0
 	help
@@ -907,7 +883,6 @@ config BR2_FORTIFY_SOURCE_2
 endchoice
 
 comment "Fortify Source needs a glibc toolchain and optimization"
-	depends on BR2_FORTIFY_SOURCE_ARCH_SUPPORTS
 	depends on (!BR2_TOOLCHAIN_USES_GLIBC || BR2_OPTIMIZE_0)
 endmenu
 

Config.in.legacy

@@ -144,563 +144,6 @@ endif
 
 ###############################################################################
 
-comment "Legacy options removed in 2022.02"
-
-config BR2_PACKAGE_WESTON_DEFAULT_FBDEV
-	bool "weston fbdev removed"
-	select BR2_LEGACY
-	help
-	  fbdev was deprecated in weston 10.0.0.
-
-config BR2_PACKAGE_WESTON_FBDEV
-	bool "weston fbdev compositor removed"
-	select BR2_LEGACY
-	help
-	  fbdev compositor was deprecated in weston 10.0.0.
-
-config BR2_PACKAGE_LINUX_TOOLS_BPFTOOL
-	bool "bpftool was moved"
-	select BR2_LEGACY
-	select BR2_PACKAGE_BPFTOOL
-	help
-	  The linux-tools bpftool build has been moved out
-	  of the linux-tools package.
-
-config BR2_TARGET_UBOOT_NEEDS_PYTHON2
-	bool "host-python 2.7 support for U-Boot was removed"
-	select BR2_LEGACY
-	help
-	  Option was removed together with python 2.7 support.
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
-	bool "gst1-plugins-bad plugin libmms was removed"
-	depends on BR2_USE_WCHAR
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_LEGACY
-	help
-	  This plugin was removed with gst1-plugins-bad-1.20.0.
-
-config BR2_PACKAGE_PYTHON_FUNCTOOLS32
-	bool "python-functools32 removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_ENUM34
-	bool "python-enum34 removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_ENUM
-	bool "python-enum removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_DIALOG
-	bool "python-dialog removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_CONFIGOBJ
-	bool "python-configobj removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_YIELDFROM
-	bool "python-yieldfrom removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_TYPING
-	bool "python-typing removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_SUBPROCESS32
-	bool "python-subprocess32 removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_SINGLEDISPATCH
-	bool "python-singledispatch removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_PYRO
-	bool "python-pyro removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_PYPCAP
-	bool "python-pypcap removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_PATHLIB2
-	bool "python-pathlib2 removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_PAM
-	bool "python-pam removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_NFC
-	bool "python-nfc removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_MAD
-	bool "python-mad removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_IPADDRESS
-	bool "python-ipaddress removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_IPADDR
-	bool "python-ipaddr removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_ID3
-	bool "python-id3 removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_FUTURES
-	bool "python-futures removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_BACKPORTS_SSL_MATCH_HOSTNAME
-	bool "python-backports-ssl-match-hostname removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE
-	bool "python-backports-shutil-get-terminal-size removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON_BACKPORTS_ABC
-	bool "python-backports-abc removed"
-	select BR2_LEGACY
-	help
-	  Package was removed together with python 2.7 support.
-
-config BR2_PACKAGE_PYTHON
-	bool "python2.7 package removed"
-	select BR2_LEGACY
-	help
-	  Python 2.7 is EOL since April 2020 and has been removed.
-
-	  https://www.python.org/dev/peps/pep-0373/
-
-config BR2_TARGET_UBOOT_ZYNQ_IMAGE
-	bool "Generate image for Xilinx Zynq"
-	select BR2_LEGACY
-	help
-	  Since 2016.1, U-Boot can natively generate the Zynq boot
-	  image, and so the Xilinx-specific format and tools have been
-	  removed. Should you still have an older U-Boot that needs
-	  this, a python3 version of the zynq-boot-bin.py script can be
-	  downloaded from the URL below and called from a post-build
-	  script.
-
-	  https://gist.githubusercontent.com/jameshilliard/e09235dfc6f96c11418a134e6ebf7890/raw/135b7480c405ae8a77a9db615e495f9a9f2d3242/zynq-boot-bin.py
-
-config BR2_PACKAGE_RPI_BT_FIRMWARE
-	bool "rpi-bt-firmware package was renamed"
-	depends on BR2_arm || BR2_aarch64
-	select BR2_LEGACY
-	select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI
-	select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT
-	help
-	  Package rpi-bt-firmware was moved as option to
-	  package brcmfmac_sdio-firmware-rpi.
-
-config BR2_PACKAGE_RPI_WIFI_FIRMWARE
-	bool "rpi-wifi-firmware package was renamed"
-	depends on BR2_arm || BR2_aarch64
-	select BR2_LEGACY
-	select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI
-	select BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI
-	help
-	  Package rpi-wifi-firmware was moved as option to
-	  package brcmfmac_sdio-firmware-rpi.
-
-config BR2_PACKAGE_HOST_GDB_PYTHON
-	bool "GDB Python2 support removed"
-	select BR2_LEGACY
-	help
-	  Python2 is deprecated and no longer supported.
-	  Please migrate to Python3.
-
-config BR2_PACKAGE_GSTREAMER1_MM
-	bool "gstreamer1-mm package removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as it is not actively
-	  maintained anymore and does not support glibmm-2.68 API.
-
-config BR2_KERNEL_HEADERS_5_14
-	bool "kernel headers version 5.14.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 5.14.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_PACKAGE_PYTHON_BACKPORTS_FUNCTOOLS_LRU_CACHE
-	bool "python-backports-functools-lru-cache package removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as python-setuptools-scm
-	  dropped support of python 2 since version 6.0.0.
-
-config BR2_PACKAGE_CIVETWEB_WITH_LUA
-	bool "civetweb lua support option removed"
-	select BR2_LEGACY
-	help
-	  Lua support does not depend on a version of Lua bundled
-	  within the Civetweb sources anymore. Lua support is
-	  automatically enabled if an Lua interpreter (lua or luajit)
-	  is enabled in Buildroot.
-
-config BR2_PACKAGE_SUNXI_MALI_MAINLINE_DRIVER
-	bool "sunxi-mali-mainline-driver package was renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_SUNXI_MALI_UTGARD_DRIVER
-	help
-	  Since the removal of the sunxi-mali-driver package, the
-	  sunxi-mali-mainline-driver package that coexisted became the
-	  only package to provide the Sunxi Mali driver. The "-mainline"
-	  suffix being undescriptive nowadays and before adding new
-	  packages bringing Mali support for other SoCs/GPU flavors, it
-	  is clearer to rename it SUNXI_MALI_UTGARD_DRIVER.
-
-config BR2_PACKAGE_SUNXI_MALI_MAINLINE
-	bool "sunxi-mali-mainline package was renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_SUNXI_MALI_UTGARD
-	help
-	  Since the removal of the sunxi-mali package, the
-	  sunxi-mali-mainline package that coexisted became the only
-	  package to provide Mali blobs. The "-mainline" suffix being
-	  undescriptive nowadays and before adding new packages bringing
-	  Mali support for other SoCs/GPU flavors, it is clearer to
-	  rename it SUNXI_MALI_UTGARD.
-
-config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R6P2
-	bool "sunxi-mali-mainline-r6p2 was renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_SUNXI_MALI_UTGARD_R6P2
-	help
-	  The sunxi-mali-mainline package has been renamed
-	  sunxi-mali-utgard, the suboptions of this package have also
-	  been renamed accordingly.
-
-config BR2_PACKAGE_SUNXI_MALI_MAINLINE_R8P1
-	bool "sunxi-mali-mainline-r8p1 was renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_SUNXI_MALI_UTGARD_R8P1
-	help
-	  The sunxi-mali-mainline package has been renamed
-	  sunxi-mali-utgard, the suboptions of this package have also
-	  been renamed accordingly.
-
-config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
-	bool "qt5webkit-examples removed"
-	select BR2_LEGACY
-	help
-	  The qt5webkit-examples package is unmaintained and has been
-	  removed.
-
-config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_GLIBC_BLEEDING_EDGE
-	bool "Bootlin riscv64 glibc bleeding-edge toolchain removed"
-	select BR2_LEGACY
-	help
-	  The RISC-V 64-bit LP64 Bootlin toolchains have been removed,
-	  in favor of RISC-V 64-bit LP64D toolchains.
-
-config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_MUSL_BLEEDING_EDGE
-	bool "Bootlin riscv64 musl bleeding-edge toolchain removed"
-	select BR2_LEGACY
-	help
-	  The RISC-V 64-bit LP64 Bootlin toolchains have been removed,
-	  in favor of RISC-V 64-bit LP64D toolchains.
-
-config BR2_PACKAGE_IPUTILS_TFTPD
-	bool "iputils tftpd option removed"
-	select BR2_LEGACY
-	help
-	  tftpd has been removed from iputils since version 20211215.
-
-config BR2_PACKAGE_IPUTILS_TRACEROUTE6
-	bool "iputils traceroute6 option removed"
-	select BR2_LEGACY
-	help
-	  traceroute6 has been removed from iputils since version
-	  20211215.
-
-config BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
-	bool "libmediaart 'none' backend removed"
-	select BR2_LEGACY
-	help
-	  'none' backend has been removed from libmediaart since version
-	  1.9.5.
-
-config BR2_PACKAGE_MPD_UPNP
-	bool "MPD UPnP configuration changed"
-	select BR2_LEGACY
-	help
-	  From version 0.23, MPD supports npupnp in addition to pupnp to
-	  provide database access to a UPnP media server. To preserve
-	  the existing functionality, the pupnp option has been selected
-	  in the MPD UPnP configuration.
-# Note: BR2_PACKAGE_MPD_UPNP is still referenced from package/mpd/Config.in
-
-comment "Legacy options removed in 2021.11"
-
-config BR2_OPENJDK_VERSION_LTS
-	bool "OpenJDK LTS version was renamed to OpenJDK 11"
-	select BR2_LEGACY
-	select BR2_PACKAGE_OPENJDK_VERSION_11
-	help
-	  The LTS version option was renamed to OpenJDK 11 to make it
-	  clear what LTS version is.
-
-config BR2_OPENJDK_VERSION_LATEST
-	bool "OpenJDK latest version (16.x) was removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_OPENJDK_VERSION_17
-	help
-	  OpenJDK 16.x is no longer mainted, so the option has been
-	  removed. Use OpenJDK 17.x instead.
-
-config BR2_PACKAGE_MPD_TIDAL
-	bool "mpd tidal option removed"
-	select BR2_LEGACY
-	help
-	  tidal has been removed from mpd since version 0.22.10.
-
-config BR2_PACKAGE_MROUTED_RSRR
-	bool "RSRR for RSVP removed in mrouted v4.4"
-	select BR2_LEGACY
-	help
-	  The RSRR configure option and feature was dropped in upstream
-	  mrouted as of v4.4.  This feature was marked as experimental
-	  since its inception well before v4.0 and was never deployed
-	  in the field outside of academia.
-
-config BR2_BINUTILS_VERSION_CSKY
-	bool "binutils csky version removed"
-	select BR2_LEGACY
-	help
-	  Support for binutils csky version has been removed.
-
-config BR2_GCC_VERSION_CSKY
-	bool "gcc csky version removed"
-	select BR2_LEGACY
-	help
-	  Support for gcc csky version has been removed.
-
-config BR2_PACKAGE_CANFESTIVAL
-	bool "canfestival package removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as it is unmaintained since
-	  November 2017.
-
-config BR2_PACKAGE_NMAP_NDIFF
-	bool "The ndiff utility has been removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_PYTHON_PYNDIFF
-	help
-	  The ndiff utility provided by nmap requires python2 which is
-	  deprecated. The same functionality is provided by the python
-	  package pyndiff.
-
-config BR2_GDB_VERSION_8_3
-	bool "gdb version 8.3.x removed"
-	select BR2_LEGACY
-	help
-	  gdb 8.3.x has been removed, use a newer version instead.
-
-config BR2_PACKAGE_PYTHON_MELD3
-	bool "python-meld3 package removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as it is unmaintained since
-	  April 2020.
-
-config BR2_PACKAGE_STRONGSWAN_EAP
-	bool "strongswan EAP plugins now individually selectable"
-	select BR2_LEGACY
-	help
-	  The various EAP plugins are now individually selectable.
-
-config BR2_PACKAGE_GNURADIO_PAGER
-	bool "gnuradio gr-flex support removed"
-	select BR2_LEGACY
-	help
-	  gr-flex has been removed from gnuradio since version 3.8.0.0.
-
-config BR2_KERNEL_HEADERS_5_11
-	bool "kernel headers version 5.11.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 5.11.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_5_12
-	bool "kernel headers version 5.12.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 5.12.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_5_13
-	bool "kernel headers version 5.13.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 5.13.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-comment "Legacy options removed in 2021.08"
-
-config BR2_TARGET_GRUB2_BUILTIN_MODULES
-	string "the grub2 builtin modules has been renamed"
-	help
-	  This option has been split to separate the builtin modules
-	  between BR2_TARGET_GRUB2_BUILTIN_MODULES_PC and
-	  BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI.
-
-config BR2_TARGET_GRUB2_BUILTIN_MODULES_WRAP
-	bool
-	default y if BR2_TARGET_GRUB2_BUILTIN_MODULES != ""
-	select BR2_LEGACY
-
-config BR2_TARGET_GRUB2_BUILTIN_CONFIG
-	string "the grub2 builtin configuration has been renamed"
-	help
-	  This option has been split to separate the builtin
-	  configuration between BR2_TARGET_GRUB2_BUILTIN_CONFIG_PC and
-	  BR2_TARGET_GRUB2_BUILTIN_CONFIG_EFI.
-
-config BR2_TARGET_GRUB2_BUILTIN_CONFIG_WRAP
-	bool
-	default y if BR2_TARGET_GRUB2_BUILTIN_CONFIG != ""
-	select BR2_LEGACY
-
-config BR2_PACKAGE_LIBMCRYPT
-	bool "libmcrypt package was removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as "the last update to libmcrypt
-	  was in 2007, despite years of unmerged patches. These facts
-	  have led security experts to declare mcrypt abandonware and
-	  discourage its use in new development" (extract from
-	  https://en.wikipedia.org/wiki/Mcrypt).
-
-config BR2_PACKAGE_MCRYPT
-	bool "mcrypt package was removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as "the last update to libmcrypt
-	  was in 2007, despite years of unmerged patches. These facts
-	  have led security experts to declare mcrypt abandonware and
-	  discourage its use in new development" (extract from
-	  https://en.wikipedia.org/wiki/Mcrypt).
-
-config BR2_PACKAGE_PHP_EXT_MCRYPT
-	bool "PHP mcrypt extension removed"
-	select BR2_LEGACY
-	help
-	  mcrypt has been removed from php since version 7.2.0.
-
-config BR2_BINUTILS_VERSION_2_34_X
-	bool "binutils 2.34 has been removed"
-	select BR2_LEGACY
-	help
-	  binutils 2.34 has been removed, use a newer version.
-
-config BR2_PACKAGE_LIBSOIL
-	bool "libsoil package removed"
-	select BR2_LEGACY
-	help
-	  The libsoil package was removed. All packages needing
-	  libsoil removed the dependency.
-
-config BR2_PACKAGE_CLAPACK
-	bool "cblas/clapack package removed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_LAPACK if BR2_PACKAGE_LAPACK_ARCH_SUPPORTS && BR2_TOOLCHAIN_HAS_FORTRAN
-	help
-	  The clapack package was removed. LAPACK no longer generates a
-	  C version. Use lapack instead. This does require a Fortran
-	  compiler however.
-
-config BR2_PACKAGE_SPIDERMONKEY
-	bool "spidermonkey package removed"
-	select BR2_LEGACY
-	help
-	  The spidermonkey package was removed. The only package that
-	  depended on spidermonkey was polkit. The spidermonkey
-	  dependency is replaced with duktape.
-
-config BR2_PACKAGE_KODI_LIBVA
-	bool "kodi option to add libva support removed"
-	select BR2_LEGACY
-	help
-	  Kodi still has support for libva if the package is enabled but
-	  the kodi-specific dependencies limiting libva support to non-
-	  OPENGLES platforms were removed including this option.
-
-config BR2_PACKAGE_PYTHON_COHERENCE
-	bool "python-coherence package removed"
-	select BR2_LEGACY
-	help
-	  This package has been removed as it can't be built anymore due
-	  to python-twisted being now incompatible with python 2.
-
-config BR2_PACKAGE_PHP_EXT_XMLRPC
-	bool "PHP XMLRPC extension removed"
-	select BR2_LEGACY
-	help
-	  The XMLRPC php extension was removed.
-	  See: https://wiki.php.net/rfc/unbundle_xmlprc
-
-config BR2_GCC_VERSION_8_X
-	bool "gcc 8.x support removed"
-	select BR2_LEGACY
-	help
-	  Support for gcc version 8.x has been removed. The current
-	  default version (10.x or later) has been selected instead.
-
 comment "Legacy options removed in 2021.05"
 
 config BR2_PACKAGE_UDISKS_LVM2
@@ -895,26 +338,6 @@ config BR2_PACKAGE_IPSEC_TOOLS
 
 comment "Legacy options removed in 2020.11"
 
-config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED
-	bool "compile with fixed serial port speed"
-	select BR2_LEGACY
-	help
-	  Since gpsd 3.20, GPSD_FIXED_PORT_SPEED is replaced
-	  by runtime option --speed.
-
-config BR2_PACKAGE_GPSD_RECONFIGURE
-	bool "allow gpsd to change device settings"
-	select BR2_LEGACY
-	help
-	  Since gpsd 3.21, GPSD_RECONFIGURE is replaced
-	  by runtime option --passive.
-
-config BR2_PACKAGE_GPSD_CONTROLSEND
-	bool "allow gpsctl/gpsmon to change device settings"
-	select BR2_LEGACY
-	help
-	  Option removed in gpsd 3.21
-
 config BR2_PACKAGE_OPENCV
 	bool "opencv package was removed"
 	select BR2_LEGACY
@@ -1737,7 +1160,7 @@ config BR2_PACKAGE_LIBUMP
 config BR2_PACKAGE_SUNXI_MALI
 	bool "sunxi-mali package removed"
 	select BR2_LEGACY
-	select BR2_PACKAGE_SUNXI_MALI_UTGARD
+	select BR2_PACKAGE_SUNXI_MALI_MAINLINE
 	help
 	  The sunxi-mali package was removed, as the
 	  sunxi-mali-mainline package replaces it for mainline

Makefile

@@ -92,9 +92,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2022.02-rc3
+export BR2_VERSION := 2021.05.1
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1646083800
+BR2_VERSION_EPOCH = 1628580000
 
 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -141,7 +141,7 @@ nobuild_targets := source %-source \
 	clean distclean help show-targets graph-depends \
 	%-graph-depends %-show-depends %-show-version \
 	graph-build graph-size list-defconfigs \
-	savedefconfig update-defconfig printvars show-vars
+	savedefconfig update-defconfig printvars
 ifeq ($(MAKECMDGOALS),)
 BR_BUILDING = y
 else ifneq ($(filter-out $(nobuild_targets),$(MAKECMDGOALS)),)
@@ -286,16 +286,12 @@ ifndef HOSTCC
 HOSTCC := gcc
 HOSTCC := $(shell which $(HOSTCC) || type -p $(HOSTCC) || echo gcc)
 endif
-ifndef HOSTCC_NOCCACHE
 HOSTCC_NOCCACHE := $(HOSTCC)
-endif
 ifndef HOSTCXX
 HOSTCXX := g++
 HOSTCXX := $(shell which $(HOSTCXX) || type -p $(HOSTCXX) || echo g++)
 endif
-ifndef HOSTCXX_NOCCACHE
 HOSTCXX_NOCCACHE := $(HOSTCXX)
-endif
 ifndef HOSTCPP
 HOSTCPP := cpp
 endif
@@ -426,7 +422,6 @@ unexport O
 unexport GCC_COLORS
 unexport PLATFORM
 unexport OS
-unexport DEVICE_TREE
 
 GNU_HOST_NAME := $(shell support/gnuconfig/config.guess)
 
@@ -438,8 +433,22 @@ QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q)
 
 # Strip off the annoying quoting
 ARCH := $(call qstrip,$(BR2_ARCH))
-NORMALIZED_ARCH := $(call qstrip,$(BR2_NORMALIZED_ARCH))
-KERNEL_ARCH := $(call qstrip,$(BR2_NORMALIZED_ARCH))
+
+KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \
+	-e s/i.86/i386/ -e s/sun4u/sparc64/ \
+	-e s/arcle/arc/ \
+	-e s/arceb/arc/ \
+	-e s/arm.*/arm/ -e s/sa110/arm/ \
+	-e s/aarch64.*/arm64/ \
+	-e s/nds32.*/nds32/ \
+	-e s/or1k/openrisc/ \
+	-e s/parisc64/parisc/ \
+	-e s/powerpc64.*/powerpc/ \
+	-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
+	-e s/riscv.*/riscv/ \
+	-e s/sh.*/sh/ \
+	-e s/s390x/s390/ \
+	-e s/microblazeel/microblaze/)
 
 ZCAT := $(call qstrip,$(BR2_ZCAT))
 BZCAT := $(call qstrip,$(BR2_BZCAT))
@@ -586,9 +595,6 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG)
 
 .PHONY: prepare
 prepare: $(BUILD_DIR)/buildroot-config/auto.conf
-	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_PRE_BUILD_SCRIPT)), \
-		$(call MESSAGE,"Executing pre-build script $(s)"); \
-		$(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
 
 .PHONY: world
 world: target-post-image
@@ -657,17 +663,32 @@ endef
 TARGET_FINALIZE_HOOKS += TOOLCHAIN_ECLIPSE_REGISTER
 endif
 
-# Generate locale data.
+# Generate locale data. Basically, we call the localedef program
+# (built by the host-localedef package) for each locale. The input
+# data comes preferably from the toolchain, or if the toolchain does
+# not have them (Linaro toolchains), we use the ones available on the
+# host machine.
 ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
 GLIBC_GENERATE_LOCALES = $(call qstrip,$(BR2_GENERATE_LOCALE))
 ifneq ($(GLIBC_GENERATE_LOCALES),)
 PACKAGES += host-localedef
 
 define GENERATE_GLIBC_LOCALES
-	$(MAKE) -f support/misc/gen-glibc-locales.mk \
-		ENDIAN=$(call LOWERCASE,$(BR2_ENDIAN)) \
-		LOCALES="$(GLIBC_GENERATE_LOCALES)" \
-		Q=$(Q)
+	$(Q)mkdir -p $(TARGET_DIR)/usr/lib/locale/
+	$(Q)for locale in $(GLIBC_GENERATE_LOCALES) ; do \
+		inputfile=`echo $${locale} | cut -f1 -d'.'` ; \
+		charmap=`echo $${locale} | cut -f2 -d'.' -s` ; \
+		if test -z "$${charmap}" ; then \
+			charmap="UTF-8" ; \
+		fi ; \
+		echo "Generating locale $${inputfile}.$${charmap}" ; \
+		I18NPATH=$(STAGING_DIR)/usr/share/i18n:/usr/share/i18n \
+		$(HOST_DIR)/bin/localedef \
+			--prefix=$(TARGET_DIR) \
+			--$(call LOWERCASE,$(BR2_ENDIAN))-endian \
+			-i $${inputfile} -f $${charmap} \
+			$${locale} ; \
+	done
 endef
 TARGET_FINALIZE_HOOKS += GENERATE_GLIBC_LOCALES
 endif
@@ -1048,20 +1069,12 @@ ifeq ($(NEED_WRAPPER),y)
 	$(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O)
 endif
 
-.PHONY: check-make-version
-check-make-version:
-ifneq ($(filter $(RUNNING_MAKE_VERSION),4.3),)
-	@echo "Make 4.3 doesn't support 'printvars' and 'show-vars' recipes"
-	@exit 1
-endif
-
 # printvars prints all the variables currently defined in our
 # Makefiles. Alternatively, if a non-empty VARS variable is passed,
 # only the variables matching the make pattern passed in VARS are
 # displayed.
-# show-vars does the same, but as a JSON dictionnary.
 .PHONY: printvars
-printvars: check-make-version
+printvars:
 	@:
 	$(foreach V, \
 		$(sort $(filter $(VARS),$(.VARIABLES))), \
@@ -1070,23 +1083,7 @@ printvars: check-make-version
 		$(if $(QUOTED_VARS),\
 			$(info $V='$(subst ','\'',$(if $(RAW_VARS),$(value $V),$($V)))'), \
 			$(info $V=$(if $(RAW_VARS),$(value $V),$($V))))))
-# ')))) # Syntax colouring...
-
-.PHONY: show-vars
-show-vars: VARS?=%
-show-vars: check-make-version
-	@:
-	$(info $(call clean-json, { \
-			$(foreach V, \
-				$(sort $(filter $(VARS),$(.VARIABLES))), \
-				$(if $(filter-out environment% default automatic, $(origin $V)), \
-					"$V": { \
-						"expanded": $(call mk-json-str,$($V))$(comma) \
-						"raw": $(call mk-json-str,$(value $V)) \
-					}$(comma) \
-				) \
-			) \
-	} ))
+# ' Syntax colouring...
 
 .PHONY: clean
 clean:
@@ -1180,8 +1177,6 @@ help:
 	@echo '  pkg-stats              - generate info about packages as JSON and HTML'
 	@echo '  missing-cpe            - generate XML snippets for missing CPE identifiers'
 	@echo '  printvars              - dump internal variables selected with VARS=...'
-	@echo '  show-vars              - dump all internal variables as a JSON blurb; use VARS=...'
-	@echo '                           to limit the list to variables names matching that pattern'
 	@echo
 	@echo '  make V=0|1             - 0 => quiet build (default), 1 => verbose build'
 	@echo '  make O=dir             - Locate all output files in "dir", including .config'
@@ -1230,7 +1225,7 @@ release:
 	$(MAKE) O=$(OUT) distclean
 	tar rf $(OUT).tar $(OUT)
 	gzip -9 -c < $(OUT).tar > $(OUT).tar.gz
-	xz -9 -c < $(OUT).tar > $(OUT).tar.xz
+	bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2
 	rm -rf $(OUT) $(OUT).tar
 
 print-version:
@@ -1244,8 +1239,8 @@ check-flake8:
 	| xargs -- python3 -m flake8 --statistics
 
 check-package:
-	find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' -o -name '*.patch' \) \
-		-exec ./utils/check-package --exclude=Sob --exclude=HashSpaces {} +
+	find $(TOPDIR) -type f \( -name '*.mk' -o -name '*.hash' -o -name 'Config.*' \) \
+		-exec ./utils/check-package {} +
 
 include docs/manual/manual.mk
 -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk)))

arch/Config.in

@@ -77,8 +77,9 @@ config BR2_aarch64_be
 
 config BR2_csky
 	bool "csky"
-	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
 	select BR2_ARCH_HAS_MMU_MANDATORY
+	# Most variants are supported by gcc-9+, except one that is
+	# handled as a special exception in package/gcc/Config.in.host
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 	help
 	  csky is processor IP from china.
@@ -209,6 +210,7 @@ config BR2_powerpc64le
 
 config BR2_riscv
 	bool "RISCV"
+	select BR2_ARCH_HAS_MMU_MANDATORY
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 	help
 	  RISC-V is an open, free Instruction Set Architecture created
@@ -319,18 +321,11 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_10
 	bool
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 
-config BR2_ARCH_NEEDS_GCC_AT_LEAST_11
-	bool
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_10
-
 # The following string values are defined by the individual
 # Config.in.$ARCH files
 config BR2_ARCH
 	string
 
-config BR2_NORMALIZED_ARCH
-	string
-
 config BR2_ENDIAN
 	string
 

arch/Config.in.arc

@@ -62,9 +62,6 @@ config BR2_ARCH
 	default "arc"	if BR2_arcle
 	default "arceb"	if BR2_arceb
 
-config BR2_NORMALIZED_ARCH
-	default "arc"
-
 config BR2_arc
 	bool
 	default y if BR2_arcle || BR2_arceb

arch/Config.in.arm

@@ -822,10 +822,6 @@ config BR2_ARCH
 	default "aarch64"	if BR2_aarch64
 	default "aarch64_be"	if BR2_aarch64_be
 
-config BR2_NORMALIZED_ARCH
-	default "arm"		if BR2_arm || BR2_armeb
-	default "arm64"		if BR2_aarch64 || BR2_aarch64_be
-
 config BR2_ENDIAN
 	default "LITTLE" if (BR2_arm || BR2_aarch64)
 	default "BIG"	 if (BR2_armeb || BR2_aarch64_be)

arch/Config.in.csky

@@ -39,9 +39,6 @@ config BR2_GCC_TARGET_FLOAT_ABI
 config BR2_ARCH
 	default "csky"
 
-config BR2_NORMALIZED_ARCH
-	default "csky"
-
 config BR2_ENDIAN
 	default "LITTLE"
 

arch/Config.in.m68k

@@ -1,9 +1,6 @@
 config BR2_ARCH
 	default "m68k"		if BR2_m68k
 
-config BR2_NORMALIZED_ARCH
-	default "m68k"
-
 config BR2_ENDIAN
 	default "BIG"
 

arch/Config.in.microblaze

@@ -2,9 +2,6 @@ config BR2_ARCH
 	default "microblazeel"  if BR2_microblazeel
 	default "microblaze"    if BR2_microblazebe
 
-config BR2_NORMALIZED_ARCH
-	default "microblaze"
-
 config BR2_ENDIAN
 	default "LITTLE" if BR2_microblazeel
 	default "BIG"	 if BR2_microblazebe

arch/Config.in.mips

@@ -235,9 +235,6 @@ config BR2_ARCH
 	default "mips64"	if BR2_mips64
 	default "mips64el"	if BR2_mips64el
 
-config BR2_NORMALIZED_ARCH
-	default "mips"
-
 config BR2_ENDIAN
 	default "LITTLE"	if BR2_mipsel || BR2_mips64el
 	default "BIG"		if BR2_mips || BR2_mips64

arch/Config.in.nds32

@@ -1,9 +1,6 @@
 config BR2_ARCH
 	default "nds32le"
 
-config BR2_NORMALIZED_ARCH
-	default "nds32"
-
 config BR2_GCC_TARGET_ARCH
 	default "v3"
 

arch/Config.in.nios2

@@ -1,9 +1,6 @@
 config BR2_ARCH
 	default "nios2"
 
-config BR2_NORMALIZED_ARCH
-	default "nios2"
-
 config BR2_ENDIAN
 	default "LITTLE"
 

arch/Config.in.or1k

@@ -1,9 +1,6 @@
 config BR2_ARCH
 	default "or1k"
 
-config BR2_NORMALIZED_ARCH
-	default "openrisc"
-
 config BR2_ENDIAN
 	default "BIG"
 

arch/Config.in.powerpc

@@ -157,9 +157,6 @@ config BR2_ARCH
 	default "powerpc64"	if BR2_powerpc64
 	default "powerpc64le"	if BR2_powerpc64le
 
-config BR2_NORMALIZED_ARCH
-	default "powerpc"
-
 config BR2_ENDIAN
 	default "BIG"    if BR2_powerpc || BR2_powerpc64
 	default "LITTLE" if BR2_powerpc64le

arch/Config.in.riscv

@@ -71,12 +71,10 @@ choice
 
 config BR2_RISCV_32
 	bool "32-bit"
-	select BR2_ARCH_HAS_MMU_MANDATORY
 
 config BR2_RISCV_64
 	bool "64-bit"
 	select BR2_ARCH_IS_64
-	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 endchoice
 
@@ -118,9 +116,6 @@ config BR2_ARCH
 	default "riscv32" if !BR2_ARCH_IS_64
 	default "riscv64" if BR2_ARCH_IS_64
 
-config BR2_NORMALIZED_ARCH
-	default "riscv"
-
 config BR2_ENDIAN
 	default "LITTLE"
 

arch/Config.in.s390x

@@ -17,9 +17,6 @@ endchoice
 config BR2_ARCH
 	default "s390x"	if BR2_s390x
 
-config BR2_NORMALIZED_ARCH
-	default "s390"
-
 config BR2_ENDIAN
 	default "BIG"
 

arch/Config.in.sh

@@ -24,9 +24,6 @@ config BR2_ARCH
 	default "sh4a"		if BR2_sh4a
 	default "sh4aeb"	if BR2_sh4aeb
 
-config BR2_NORMALIZED_ARCH
-	default "sh"
-
 config BR2_ENDIAN
 	default "LITTLE"	if BR2_sh4 || BR2_sh4a
 	default "BIG"		if BR2_sh2a || BR2_sh4eb || BR2_sh4aeb

arch/Config.in.sparc

@@ -21,10 +21,6 @@ config BR2_ARCH
 	default "sparc"	if BR2_sparc
 	default "sparc64" if BR2_sparc64
 
-config BR2_NORMALIZED_ARCH
-	default "sparc"	if BR2_sparc
-	default "sparc64" if BR2_sparc64
-
 config BR2_ENDIAN
 	default "BIG"
 

arch/Config.in.x86

@@ -19,12 +19,7 @@ config BR2_X86_CPU_HAS_AVX
 	bool
 config BR2_X86_CPU_HAS_AVX2
 	bool
-config BR2_X86_CPU_HAS_AVX512
-	bool
 
-# This list of CPU architecture variant is (loosely) ordered according
-# to the gcc documentation at
-# https://gcc.gnu.org/onlinedocs/gcc-11.2.0/gcc/x86-Options.html
 choice
 	prompt "Target Architecture Variant"
 	default BR2_x86_i586 if BR2_i386
@@ -86,78 +81,6 @@ config BR2_x86_prescott
 	select BR2_X86_CPU_HAS_SSE
 	select BR2_X86_CPU_HAS_SSE2
 	select BR2_X86_CPU_HAS_SSE3
-config BR2_x86_x86_64
-	bool "x86-64"
-	depends on BR2_x86_64
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	help
-	  This option corresponds to -march=x86-64, documented as a
-	  "Generic CPU with 64-bit extensions" by the GCC
-	  documentation. It is a 64-bit CPU with MMX, SSE and SSE2
-	  support.
-config BR2_x86_x86_64_v2
-	bool "x86-64-v2"
-	depends on BR2_x86_64
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_11
-	help
-	  This option corresponds to the x86-64-v2 micro-architecture
-	  level, as defined by the x86-64 psABI document, see
-	  https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex.
-
-	  It is close to the Nehalem CPU architecture, and is
-	  applicable for CPUs that support CMPXCHG16B, LAHF-SAHF,
-	  POPCNT, SSE3, SSE4.1, SSE4.2, SSSE3.
-config BR2_x86_x86_64_v3
-	bool "x86-64-v3"
-	depends on BR2_x86_64
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_11
-	help
-	  This option corresponds to the x86-64-v3 micro-architecture
-	  level, as defined by the x86-64 psABI document, see
-	  https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex.
-
-	  It is close to the Haswell CPU architecture, and is
-	  applicable for CPUs that support all of x86-64-v2 plus AVX,
-	  AVX2, BMI1, BMI2, F16C, FMA, LZCNT, MOVBE, XSAVE.
-config BR2_x86_x86_64_v4
-	bool "x86-64-v4"
-	depends on BR2_x86_64
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_11
-	help
-	  This option corresponds to the x86-64-v4 micro-architecture
-	  level, as defined by the x86-64 psABI document, see
-	  https://gitlab.com/x86-psABIs/x86-64-ABI/-/blob/master/x86-64-ABI/low-level-sys-info.tex.
-
-	  It is applicable for CPUs that support all of x86-64-v3 plus
-	  AVX512F, AVX512BW, AVX512CD, AVX512DQ, AVX512VL.
 config BR2_x86_nocona
 	bool "nocona"
 	select BR2_X86_CPU_HAS_MMX
@@ -180,19 +103,6 @@ config BR2_x86_corei7
 	select BR2_X86_CPU_HAS_SSSE3
 	select BR2_X86_CPU_HAS_SSE4
 	select BR2_X86_CPU_HAS_SSE42
-	help
-	  This option is deprecated. Since gcc 4.9, the gcc option
-	  "nehalem" is preferred. Use BR2_x86_nehalem instead.
-config BR2_x86_nehalem
-	bool "nehalem"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
 config BR2_x86_westmere
 	bool "westmere"
 	select BR2_X86_CPU_HAS_MMX
@@ -202,7 +112,6 @@ config BR2_x86_westmere
 	select BR2_X86_CPU_HAS_SSSE3
 	select BR2_X86_CPU_HAS_SSE4
 	select BR2_X86_CPU_HAS_SSE42
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
 config BR2_x86_corei7_avx
 	bool "corei7-avx"
 	select BR2_X86_CPU_HAS_MMX
@@ -213,20 +122,6 @@ config BR2_x86_corei7_avx
 	select BR2_X86_CPU_HAS_SSE4
 	select BR2_X86_CPU_HAS_SSE42
 	select BR2_X86_CPU_HAS_AVX
-	help
-	  This option is deprecated. Since gcc 4.9, the gcc option
-	  "sandybridge" is preferred. Use BR2_x86_sandybridge instead.
-config BR2_x86_sandybridge
-	bool "sandybridge"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
 config BR2_x86_core_avx2
 	bool "core-avx2"
 	select BR2_X86_CPU_HAS_MMX
@@ -238,45 +133,6 @@ config BR2_x86_core_avx2
 	select BR2_X86_CPU_HAS_SSE42
 	select BR2_X86_CPU_HAS_AVX
 	select BR2_X86_CPU_HAS_AVX2
-	help
-	  This option is deprecated. Since gcc 4.9, the gcc option
-	  "haswell" is preferred. Use BR2_x86_haswell instead.
-config BR2_x86_haswell
-	bool "haswell"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
-config BR2_x86_broadwell
-	bool "broadwell"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
-config BR2_x86_skylake
-	bool "skylake"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_x86_atom
 	bool "atom"
 	select BR2_X86_CPU_HAS_MMX
@@ -284,17 +140,6 @@ config BR2_x86_atom
 	select BR2_X86_CPU_HAS_SSE2
 	select BR2_X86_CPU_HAS_SSE3
 	select BR2_X86_CPU_HAS_SSSE3
-	help
-	  This option is deprecated. Since gcc 4.9, the gcc option
-	  "bonnel" is preferred. Use BR2_x86_bonnel instead.
-config BR2_x86_bonnel
-	bool "bonnel"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
 config BR2_x86_silvermont
 	bool "silvermont"
 	select BR2_X86_CPU_HAS_MMX
@@ -304,167 +149,6 @@ config BR2_x86_silvermont
 	select BR2_X86_CPU_HAS_SSSE3
 	select BR2_X86_CPU_HAS_SSE4
 	select BR2_X86_CPU_HAS_SSE42
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
-config BR2_x86_goldmont
-	bool "goldmont"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_x86_goldmont_plus
-	bool "goldmont-plus"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_x86_tremont
-	bool "tremont"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_x86_skylake_avx512
-	bool "skylake-avx512"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
-config BR2_x86_cannonlake
-	bool "cannonlake"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
-config BR2_x86_icelake_client
-	bool "icelake-client"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
-config BR2_x86_icelake_server
-	bool "icelake-server"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
-config BR2_x86_cascadelake
-	bool "cascadelake"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_x86_cooperlake
-	bool "cooperlake"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_10
-config BR2_x86_tigerlake
-	bool "tigerlake"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
-config BR2_x86_sapphirerapids
-	bool "sapphirerapids"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_11
-config BR2_x86_alderlake
-	bool "alderlake"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_11
-config BR2_x86_rocketlake
-	bool "rocketlake"
-	select BR2_X86_CPU_HAS_MMX
-	select BR2_X86_CPU_HAS_SSE
-	select BR2_X86_CPU_HAS_SSE2
-	select BR2_X86_CPU_HAS_SSE3
-	select BR2_X86_CPU_HAS_SSSE3
-	select BR2_X86_CPU_HAS_SSE4
-	select BR2_X86_CPU_HAS_SSE42
-	select BR2_X86_CPU_HAS_AVX
-	select BR2_X86_CPU_HAS_AVX2
-	select BR2_X86_CPU_HAS_AVX512
-	select BR2_ARCH_NEEDS_GCC_AT_LEAST_11
 config BR2_x86_k6
 	bool "k6"
 	depends on !BR2_x86_64
@@ -556,16 +240,30 @@ config BR2_ARCH
 	default "i686"		if BR2_x86_c32
 	default "i586"		if BR2_x86_winchip_c6
 	default "i586"		if BR2_x86_winchip2
-	# We use the property of Kconfig that the first match of a
-	# list of default will be chosen. So the following entry will
-	# not match for all BR2_i386=y configurations, but only the
-	# ones that didn't match any of the previous cases (i486,
-	# i586).
-	default "i686"		if BR2_i386
-	default "x86_64"	if BR2_x86_64
-
-config BR2_NORMALIZED_ARCH
-	default "i386"		if !BR2_x86_64
+	default "i686"		if BR2_x86_i686
+	default "i686"		if BR2_x86_pentium2
+	default "i686"		if BR2_x86_pentium3
+	default "i686"		if BR2_x86_pentium4
+	default "i686"		if BR2_x86_pentium_m
+	default "i686"		if BR2_x86_pentiumpro
+	default "i686"		if BR2_x86_prescott
+	default "i686"		if BR2_x86_nocona && BR2_i386
+	default "i686"		if BR2_x86_core2 && BR2_i386
+	default "i686"		if BR2_x86_corei7 && BR2_i386
+	default "i686"		if BR2_x86_westmere && BR2_i386
+	default "i686"		if BR2_x86_corei7_avx && BR2_i386
+	default "i686"		if BR2_x86_core_avx2 && BR2_i386
+	default "i686"		if BR2_x86_atom && BR2_i386
+	default "i686"		if BR2_x86_silvermont && BR2_i386
+	default "i686"		if BR2_x86_opteron && BR2_i386
+	default "i686"		if BR2_x86_opteron_sse3 && BR2_i386
+	default "i686"		if BR2_x86_barcelona && BR2_i386
+	default "i686"		if BR2_x86_jaguar && BR2_i386
+	default "i686"		if BR2_x86_steamroller && BR2_i386
+	default "i686"		if BR2_x86_k6
+	default "i686"		if BR2_x86_k6_2
+	default "i686"		if BR2_x86_athlon
+	default "i686"		if BR2_x86_athlon_4
 	default "x86_64"	if BR2_x86_64
 
 config BR2_ENDIAN
@@ -583,37 +281,14 @@ config BR2_GCC_TARGET_ARCH
 	default "pentium3"	if BR2_x86_pentium3
 	default "pentium4"	if BR2_x86_pentium4
 	default "prescott"	if BR2_x86_prescott
-	default "x86-64"	if BR2_x86_x86_64
-	default "x86-64-v2"	if BR2_x86_x86_64_v2
-	default "x86-64-v3"	if BR2_x86_x86_64_v3
-	default "x86-64-v4"	if BR2_x86_x86_64_v4
 	default "nocona"	if BR2_x86_nocona
 	default "core2"		if BR2_x86_core2
 	default "corei7"	if BR2_x86_corei7
-	default "nehalem"	if BR2_x86_nehalem
 	default "corei7-avx"	if BR2_x86_corei7_avx
-	default "sandybridge"	if BR2_x86_sandybridge
 	default "core-avx2"	if BR2_x86_core_avx2
-	default "haswell"	if BR2_x86_haswell
-	default "broadwell"	if BR2_x86_broadwell
-	default "skylake"	if BR2_x86_skylake
 	default "atom"		if BR2_x86_atom
-	default "bonnel"	if BR2_x86_bonnel
 	default "westmere"	if BR2_x86_westmere
 	default "silvermont"	if BR2_x86_silvermont
-	default "goldmont"	if BR2_x86_goldmont
-	default "goldmont-plus"	if BR2_x86_goldmont_plus
-	default "tremont"	if BR2_x86_tremont
-	default "skylake-avx512" if BR2_x86_skylake_avx512
-	default "cannonlake"	if BR2_x86_cannonlake
-	default "icelake-client" if BR2_x86_icelake_client
-	default "icelake-server" if BR2_x86_icelake_server
-	default "cascadelake"	if BR2_x86_cascadelake
-	default "cooperlake"	if BR2_x86_cooperlake
-	default "tigerlake"	if BR2_x86_tigerlake
-	default "sapphirerapids" if BR2_x86_sapphirerapids
-	default "alderlake"	if BR2_x86_alderlake
-	default "rocketlake"	if BR2_x86_rocketlake
 	default "k8"		if BR2_x86_opteron
 	default "k8-sse3"	if BR2_x86_opteron_sse3
 	default "barcelona"	if BR2_x86_barcelona

arch/Config.in.xtensa

@@ -48,9 +48,6 @@ config BR2_ENDIAN
 config BR2_ARCH
 	default "xtensa"	if BR2_xtensa
 
-config BR2_NORMALIZED_ARCH
-	default "xtensa"
-
 config BR2_READELF_ARCH_NAME
 	default "Tensilica Xtensa Processor"
 

board/aarch64-efi/genimage-efi.cfg

@@ -1,30 +1,32 @@
 image efi-part.vfat {
-	vfat {
-		file EFI {
-			image = "efi-part/EFI"
-		}
-		file Image {
-			image = "Image"
-		}
-	}
-
-	size = 64M
+  vfat {
+    file startup.nsh {
+      image = "efi-part/startup.nsh"
+    }
+    file EFI {
+      image = "efi-part/EFI"
+    }
+    file Image {
+      image = "Image"
+    }
+  }
+  size = 32M
 }
 
 image disk.img {
-	hdimage {
-		partition-table-type = "gpt"
-	}
+  hdimage {
+    gpt = true
+  }
 
-	partition boot {
-		image = "efi-part.vfat"
-		partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b
-		offset = 32K
-		bootable = true
-	}
+  partition boot {
+    image = "efi-part.vfat"
+    partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b
+    offset = 32768
+    bootable = true
+  }
 
-	partition root {
-		partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae
-		image = "rootfs.ext2"
-	}
+  partition root {
+    partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae
+    image = "rootfs.ext2"
+  }
 }

board/aarch64-efi/readme.txt

@@ -45,7 +45,7 @@ the instructions in [3], with qemu_arm64_defconfig.
 
 This should give you a nor_flash.bin, which you can use with qemu as an
 alternative to QEMU_EFI.fd. You will also need to change the machine
-specification to "-M virt,secure=on" on qemu command line, to enable TrustZone
+specification to "-M virt,secure" on qemu command line, to enable TrustZone
 support, and you will need to increase the memory with "-m 1024".
 
 [1]: https://github.com/ARM-software/ebbr

board/acmesystems/acqua-a5/genimage.cfg

@@ -8,7 +8,6 @@ image boot.vfat {
 			"at91-sama5d3_acqua.dtb"
 		}
 	}
-
 	size = 16M
 }
 

board/acmesystems/aria-g25/genimage.cfg

@@ -11,10 +11,9 @@ image boot.vfat {
 		}
 
 		file boot.bin {
-			image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.10.3.bin"
+			image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.13.bin"
 		}
 	}
-
 	size = 16M
 }
 

board/acmesystems/arietta-g25/genimage.cfg

@@ -5,16 +5,15 @@ image boot.vfat {
 		file zImage {
 			image = "zImage"
 		}
-
+		
 		file acme-arietta.dtb {
 			image = "at91-ariettag25.dtb"
 		}
-
+		
 		file boot.bin {
-			image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.10.3.bin"
-		}
+			image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.13.bin"
+		} 
 	}
-
 	size = 16M
 }
 

board/altera/socrates_cyclone5/genimage.cfg

@@ -5,7 +5,6 @@ image boot.vfat {
 			"socfpga_cyclone5_socrates.dtb"
 		}
 	}
-
 	size = 8M
 }
 
@@ -18,13 +17,13 @@ image uboot.img {
 		in-partition-table = "no"
 		image = "u-boot-spl.bin.crc"
 		offset = 0
-		size = 64K
+		size = 64k
 	}
 
 	partition uboot-full {
 		in-partition-table = "no"
 		image = "u-boot.img"
-		offset = 256K
+		offset = 256k
 	}
 
 	size = 1M
@@ -37,7 +36,7 @@ image sdcard.img {
 	partition uboot-env {
 		in-partition-table = "no"
 		image = "uboot-env.bin"
-		offset = 17K # 512 * 34 -> just after gpt
+		offset = 17408 # 512 * 34 -> just after gpt
 	}
 
 	partition boot {

board/amarula/a64-relic/genimage.cfg

@@ -6,6 +6,5 @@ image boot.vfat {
 			"extlinux"
 		}
 	}
-
 	size = 64M
 }

board/amarula/vyasa/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch

@@ -0,0 +1,35 @@
+From 8ee2b03039cccf64402a72dea2185d7fe1972729 Mon Sep 17 00:00:00 2001
+From: Shyam Saini <shyam.saini@amarulasolutions.com>
+Date: Mon, 15 Apr 2019 16:16:16 +0530
+Subject: [PATCH] include: configs: Increase CONFIG_SYS_BOOTM_LEN to 16MB
+
+The default value of CONFIG_SYS_BOOTM_LEN is 0x800000 i.e, 8MB which
+causes board reset because of larger uImage size.
+
+Error log snippet:
+   Booting using the fdt blob at 0x1f00000
+   Loading Kernel Image ... Image too large: increase CONFIG_SYS_BOOTM_LEN
+Must RESET board to recover
+resetting ...
+
+Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
+---
+ include/configs/rk3288_common.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
+index 72a54bc0ab..eab7cf4d86 100644
+--- a/include/configs/rk3288_common.h
++++ b/include/configs/rk3288_common.h
+@@ -9,6 +9,8 @@
+ #include <asm/arch/hardware.h>
+ #include "rockchip-common.h"
+ 
++#define CONFIG_SYS_BOOTM_LEN (16 << 20) /* 16MB */
++
+ #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
+ #define CONFIG_SYS_MALLOC_LEN		(32 << 20)
+ #define CONFIG_SYS_CBSIZE		1024
+-- 
+2.11.0
+

board/andes/patches/linux/0002-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch

@@ -1,52 +0,0 @@
-From f9df4186c17d686f1ca38f973d7a3a49e8e37c01 Mon Sep 17 00:00:00 2001
-From: Dirk Mueller <dmueller@suse.com>
-Date: Tue, 14 Jan 2020 18:53:41 +0100
-Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration
-
-gcc 10 will default to -fno-common, which causes this error at link
-time:
-
-  (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here
-
-This is because both dtc-lexer as well as dtc-parser define the same
-global symbol yyloc. Before with -fcommon those were merged into one
-defintion. The proper solution would be to to mark this as "extern",
-however that leads to:
-
-  dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]
-   26 | extern YYLTYPE yylloc;
-      |                ^~~~~~
-In file included from dtc-lexer.l:24:
-dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here
-  127 | extern YYLTYPE yylloc;
-      |                ^~~~~~
-cc1: all warnings being treated as errors
-
-which means the declaration is completely redundant and can just be
-dropped.
-
-Signed-off-by: Dirk Mueller <dmueller@suse.com>
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-[robh: cherry-pick from upstream]
-Cc: stable@vger.kernel.org
-Signed-off-by: Rob Herring <robh@kernel.org>
-Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
----
- scripts/dtc/dtc-lexer.l | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
-index 06c040902444..d1b3810156c7 100644
---- a/scripts/dtc/dtc-lexer.l
-+++ b/scripts/dtc/dtc-lexer.l
-@@ -38,7 +38,6 @@ LINECOMMENT	"//".*\n
- #include "srcpos.h"
- #include "dtc-parser.tab.h"
- 
--YYLTYPE yylloc;
- extern bool treesource_error;
- 
- /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
--- 
-2.25.1
-

board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch

@@ -0,0 +1,35 @@
+From 8ee2b03039cccf64402a72dea2185d7fe1972729 Mon Sep 17 00:00:00 2001
+From: Shyam Saini <shyam.saini@amarulasolutions.com>
+Date: Mon, 15 Apr 2019 16:16:16 +0530
+Subject: [PATCH] include: configs: Increase CONFIG_SYS_BOOTM_LEN to 16MB
+
+The default value of CONFIG_SYS_BOOTM_LEN is 0x800000 i.e, 8MB which
+causes board reset because of larger uImage size.
+
+Error log snippet:
+   Booting using the fdt blob at 0x1f00000
+   Loading Kernel Image ... Image too large: increase CONFIG_SYS_BOOTM_LEN
+Must RESET board to recover
+resetting ...
+
+Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
+---
+ include/configs/rk3288_common.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
+index 72a54bc0ab..eab7cf4d86 100644
+--- a/include/configs/rk3288_common.h
++++ b/include/configs/rk3288_common.h
+@@ -9,6 +9,8 @@
+ #include <asm/arch/hardware.h>
+ #include "rockchip-common.h"
+ 
++#define CONFIG_SYS_BOOTM_LEN (16 << 20) /* 16MB */
++
+ #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
+ #define CONFIG_SYS_MALLOC_LEN		(32 << 20)
+ #define CONFIG_SYS_CBSIZE		1024
+-- 
+2.11.0
+

board/atmel/at91sam9x5ek_mmc/genimage.cfg

@@ -17,7 +17,6 @@ image boot.vfat {
 			image = "uboot-env.bin"
 		}
 	}
-
 	size = 16M
 }
 

board/atmel/readme.txt

@@ -23,10 +23,6 @@ This guide covers the following configurations:
  - microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig
  - microchip_sam9x60ek_mmc_defconfig
  - microchip_sam9x60ek_mmc_dev_defconfig
- - microchip_sama5d2_icp_mmc_defconfig
- - microchip_sama5d2_icp_mmc_dev_defconfig
- - microchip_sama7g5ek_mmc_defconfig
- - microchip_sama7g5ek_mmc_dev_defconfig
 
 These configurations will use AT91Bootstrap, u-boot and a linux kernel from
 the git trees maintained by Atmel.

board/atmel/sama5d27_som1_ek_mmc/genimage.cfg

@@ -9,7 +9,6 @@ image boot.vfat {
 			"u-boot.bin"
 		}
 	}
-
 	size = 16M
 }
 

board/atmel/sama5d27_wlsom1_ek_mmc/genimage.cfg

@@ -9,7 +9,6 @@ image boot.vfat {
 			"u-boot.bin"
 		}
 	}
-
 	size = 16M
 }
 

board/atmel/sama5d2_xplained_mmc/genimage.cfg

@@ -9,7 +9,6 @@ image boot.vfat {
 			"u-boot.bin"
 		}
 	}
-
 	size = 16M
 }
 

board/atmel/sama5d3_xplained_mmc/genimage.cfg

@@ -9,7 +9,6 @@ image boot.vfat {
 			"u-boot.bin"
 		}
 	}
-
 	size = 16M
 }
 

board/atmel/sama5d4_xplained_mmc/genimage.cfg

@@ -9,7 +9,6 @@ image boot.vfat {
 			"u-boot.bin"
 		}
 	}
-
 	size = 16M
 }
 

board/bananapi/bananapi-m1/genimage.cfg

@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }
 
@@ -17,8 +16,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}
 
 	partition boot {

board/bananapi/bananapi-m2-ultra/genimage.cfg

@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }
 
@@ -17,8 +16,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}
 
 	partition boot {

board/bananapi/bananapi-m2-zero/genimage.cfg

@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }
 
@@ -17,8 +16,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}
 
 	partition boot {

board/bananapi/bananapi-m64/genimage.cfg

@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }
 
@@ -17,14 +16,14 @@ image sdcard.img {
 	partition spl {
 		in-partition-table = "no"
 		image = "sunxi-spl.bin"
-		offset = 8K
+		offset = 8192
 	}
 
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot.itb"
 		offset = 40K
-		size = 1M # 1MB - 40KB
+		size = 1M # 1MB - 40K
 	}
 
 	partition boot {

board/beagleboardx15/genimage.cfg

@@ -5,7 +5,6 @@ image boot.vfat {
 			"u-boot.img"
 		}
 	}
-
 	size = 4M
 }
 
@@ -16,7 +15,7 @@ image sdcard.img {
 	partition u-boot {
 		partition-type = 0xC
 		bootable = "true"
-		image = "boot.vfat"
+                image = "boot.vfat"
 	}
 
 	partition rootfs {

board/beaglebone/genimage.cfg

@@ -10,10 +10,8 @@ image boot.vfat {
 			"am335x-bone.dtb",
 			"am335x-boneblack.dtb",
 			"am335x-bonegreen.dtb",
-			"am335x-boneblack-wireless.dtb",
 		}
 	}
-
 	size = 16M
 }
 
@@ -24,7 +22,7 @@ image sdcard.img {
 	partition u-boot {
 		partition-type = 0xC
 		bootable = "true"
-		image = "boot.vfat"
+                image = "boot.vfat"
 	}
 
 	partition rootfs {

board/beagleboneai/genimage.cfg

@@ -8,7 +8,6 @@ image boot.vfat {
 			"uEnv.txt"
 		}
 	}
-
 	size = 16M
 }
 

board/beagleboneai/patches/uboot/0001-am57xx_evm-fixes.patch

@@ -1,839 +0,0 @@
-From 702ea30b462ba06f4fbee3393f0e6c19531f1e5f Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 25 Jun 2021 11:33:25 -0500
-Subject: [PATCH] am57xx_evm-fixes
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
-[Patch from https://github.com/beagleboard/u-boot/commit/702ea30b462ba06f4fbee3393f0e6c19531f1e5f]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- arch/arm/mach-omap2/omap5/hw_data.c |   1 +
- board/ti/am57xx/board.c             | 167 +++++++++++-
- configs/am57xx_evm_defconfig        |  15 +-
- include/configs/ti_armv7_common.h   | 407 ++++++++++++++++++++++++++++
- include/configs/ti_omap5_common.h   |   5 +
- include/environment/ti/boot.h       |  32 ++-
- include/environment/ti/mmc.h        |  49 +++-
- 7 files changed, 651 insertions(+), 25 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/omap5/hw_data.c b/arch/arm/mach-omap2/omap5/hw_data.c
-index fa4e27063c..d5192b1671 100644
---- a/arch/arm/mach-omap2/omap5/hw_data.c
-+++ b/arch/arm/mach-omap2/omap5/hw_data.c
-@@ -421,6 +421,7 @@ void enable_basic_clocks(void)
- 		(*prcm)->cm_l4per_uart1_clkctrl,
- 		(*prcm)->cm_l4per_uart3_clkctrl,
- 		(*prcm)->cm_l4per_i2c1_clkctrl,
-+		(*prcm)->cm_l4per_i2c4_clkctrl,
- #ifdef CONFIG_DRIVER_TI_CPSW
- 		(*prcm)->cm_gmac_gmac_clkctrl,
- #endif
-diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
-index 73063faee6..ad05c41f22 100644
---- a/board/ti/am57xx/board.c
-+++ b/board/ti/am57xx/board.c
-@@ -41,6 +41,7 @@
- #include <mmc.h>
- #include <dm/uclass.h>
- #include <hang.h>
-+#include <i2c.h>
- 
- #include "../common/board_detect.h"
- #include "mux_data.h"
-@@ -528,8 +529,10 @@ void do_board_detect(void)
- 
- 	rc = ti_i2c_eeprom_am_get(CONFIG_EEPROM_BUS_ADDRESS,
- 				  CONFIG_EEPROM_CHIP_ADDRESS);
--	if (rc)
-+	if (rc) {
- 		printf("ti_i2c_eeprom_init failed %d\n", rc);
-+		ti_i2c_eeprom_am_set("BBONE-AI", "A");
-+	};
- 
- #ifdef CONFIG_SUPPORT_EMMC_BOOT
- 	rc = board_bootmode_has_emmc();
-@@ -579,6 +582,164 @@ void do_board_detect(void)
- 			 "Board: %s REV %s\n", bname, board_ti_get_rev());
- }
- 
-+struct am335x_cape_eeprom_id {
-+	unsigned int header;
-+	char eeprom_rev[2];
-+	char board_name[32];
-+	char version[4];
-+	char manufacture[16];
-+	char part_number[16];
-+	char number_of_pins[2];
-+	char serial_number[12];
-+	char pin_usage[140];
-+	char vdd_3v3exp[ 2];
-+	char vdd_5v[ 2];
-+	char sys_5v[2];
-+	char dc_supplied[2];
-+};
-+
-+#define CAPE_EEPROM_BUS_NUM 3
-+#define CAPE_EEPROM_ADDR0	0x54
-+#define CAPE_EEPROM_ADDR1	0x55
-+#define CAPE_EEPROM_ADDR2	0x56
-+#define CAPE_EEPROM_ADDR3	0x57
-+
-+#define CAPE_EEPROM_ADDR_LEN 0x10
-+
-+static int probe_cape_eeprom(struct am335x_cape_eeprom_id *cape_header)
-+{
-+	int ret;
-+	struct udevice *dev;
-+	unsigned char addr;
-+	/* /lib/firmware/BB-CAPE-DISP-CT4-00A0.dtbo */
-+	/* 14 + 16 + 1 + 4 + 5 = 40 */
-+	char hash_cape_overlay[40];
-+	char cape_overlay[26];
-+	char process_cape_part_number[16];
-+	char process_cape_version[4];
-+	char end_part_number;
-+	char cape_overlay_pass_to_kernel[18];
-+
-+	strlcpy(cape_overlay_pass_to_kernel, "", 1);
-+
-+	for ( addr = CAPE_EEPROM_ADDR0; addr <= CAPE_EEPROM_ADDR3; addr++ ) {
-+		ret = i2c_get_chip_for_busnum(CAPE_EEPROM_BUS_NUM, addr, 1, &dev);
-+		if (ret) {
-+			printf("BeagleBone Cape EEPROM: no EEPROM at address: 0x%x\n", addr);
-+		} else {
-+			printf("BeagleBone Cape EEPROM: found EEPROM at address: 0x%x\n", addr);
-+
-+			ret = i2c_set_chip_offset_len(dev, 2);
-+			if (ret) {
-+				printf("BeagleBone Cape EEPROM: i2c_set_chip_offset_len failure\n");
-+			}
-+
-+			ret = dm_i2c_read(dev, 0, (uchar *)cape_header, sizeof(struct am335x_cape_eeprom_id));
-+			if (ret) {
-+				printf("BeagleBone Cape EEPROM: Cannot read eeprom params\n");
-+			}
-+
-+			if (cape_header->header == 0xEE3355AA) {
-+				strlcpy(hash_cape_overlay, "/lib/firmware/", 14 + 1);
-+				strlcpy(cape_overlay, "", 2);
-+				strlcpy(cape_overlay_pass_to_kernel, "", 2);
-+				strlcpy(process_cape_part_number, "...............", 16 + 1);
-+				strlcpy(process_cape_version, "...", 4 + 1);
-+
-+				strlcpy(process_cape_part_number, cape_header->part_number, 16 + 1);
-+				printf("BeagleBone Cape EEPROM: debug part_number field:[%s]\n", process_cape_part_number);
-+
-+				//FIXME: some capes end with '.'
-+				if ( process_cape_part_number[15] == 0x2E ) {
-+					puts("debug: fixup, extra . in eeprom field\n");
-+					process_cape_part_number[15] = 0x00;
-+					if ( process_cape_part_number[14] == 0x2E ) {
-+						process_cape_part_number[14] = 0x00;
-+					}
-+				}
-+
-+				//Find ending 0x00 or 0xFF
-+				puts("BeagleBone Cape EEPROM: debug part_number field HEX:[");
-+				end_part_number=16;
-+				for ( int i=0; i <= 16; i++ ) {
-+					if (( process_cape_part_number[i] == 0x00 ) || ( process_cape_part_number[i] == 0xFF )) {
-+						end_part_number=i;
-+						i=17;
-+					} else {
-+						printf("%x", process_cape_part_number[i]);
-+					}
-+				}
-+				puts("]\n");
-+
-+				strncat(cape_overlay_pass_to_kernel, process_cape_part_number, end_part_number);
-+				strncat(cape_overlay_pass_to_kernel, ",", 1);
-+				//printf("debug: %s\n", cape_overlay_pass_to_kernel);
-+
-+				strncat(hash_cape_overlay, process_cape_part_number, end_part_number);
-+				strncat(cape_overlay, process_cape_part_number, end_part_number);
-+				//printf("debug: %s %s\n", hash_cape_overlay, cape_overlay);
-+
-+				strncat(hash_cape_overlay, "-", 1);
-+				strncat(cape_overlay, "-", 1);
-+				//printf("debug: %s %s\n", hash_cape_overlay, cape_overlay);
-+
-+				strlcpy(process_cape_version, cape_header->version, 4 + 1);
-+				//printf("debug: version field:[%s]\n", process_cape_version);
-+
-+				//Find invalid 0xFF -> 0x30 BBAI FAN Cape...
-+				puts("BeagleBone Cape EEPROM: debug version field HEX:[");
-+				for ( int i=0; i <= 3; i++ ) {
-+					printf("%x", process_cape_version[i]);
-+					if ( process_cape_version[i] == 0xFF ) {
-+						process_cape_version[i] = 0x30;
-+					}
-+				}
-+				puts("]\n");
-+
-+				strncat(hash_cape_overlay, process_cape_version, 4);
-+				strncat(cape_overlay, process_cape_version, 4);
-+				//printf("debug: %s %s\n", hash_cape_overlay, cape_overlay);
-+
-+				strncat(hash_cape_overlay, ".dtbo", 5);
-+				strncat(cape_overlay, ".dtbo", 5);
-+				//printf("debug: %s %s\n", hash_cape_overlay, cape_overlay);
-+
-+				printf("BeagleBone Cape EEPROM: 0x%x %s\n", addr, cape_overlay);
-+
-+				switch(addr) {
-+					case CAPE_EEPROM_ADDR0:
-+						env_set("uboot_overlay_addr0", cape_overlay);
-+						env_set("uboot_detected_capes_addr0", cape_overlay_pass_to_kernel);
-+						break;
-+					case CAPE_EEPROM_ADDR1:
-+						env_set("uboot_overlay_addr1", cape_overlay);
-+						env_set("uboot_detected_capes_addr1", cape_overlay_pass_to_kernel);
-+						break;
-+					case CAPE_EEPROM_ADDR2:
-+						env_set("uboot_overlay_addr2", cape_overlay);
-+						env_set("uboot_detected_capes_addr2", cape_overlay_pass_to_kernel);
-+						break;
-+					case CAPE_EEPROM_ADDR3:
-+						env_set("uboot_overlay_addr3", cape_overlay);
-+						env_set("uboot_detected_capes_addr3", cape_overlay_pass_to_kernel);
-+						break;
-+				}
-+				env_set("uboot_detected_capes", "1");
-+			} else {
-+				printf("BeagleBone Cape EEPROM: EEPROM contents not valid (or blank) on address: 0x%x\n", addr);
-+			}
-+		}
-+	}
-+	return 0;
-+}
-+
-+void do_cape_detect(void)
-+{
-+	struct am335x_cape_eeprom_id cape_header;
-+
-+	probe_cape_eeprom(&cape_header);
-+}
-+
- static void setup_board_eeprom_env(void)
- {
- 	char *name = "beagle_x15";
-@@ -782,8 +943,10 @@ int board_late_init(void)
- 	/* Just probe the potentially supported cdce913 device */
- 	uclass_get_device(UCLASS_CLK, 0, &dev);
- 
--	if (board_is_bbai())
-+	if (board_is_bbai()) {
- 		env_set("console", "ttyS0,115200n8");
-+		do_cape_detect();
-+	}
- 
- #if !defined(CONFIG_SPL_BUILD)
- 	board_ti_set_ethaddr(2);
-diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
-index 4da4aaa1c7..ed5b8aec16 100644
---- a/configs/am57xx_evm_defconfig
-+++ b/configs/am57xx_evm_defconfig
-@@ -10,16 +10,20 @@ CONFIG_SPL_TEXT_BASE=0x40300000
- CONFIG_OMAP54XX=y
- CONFIG_TARGET_AM57XX_EVM=y
- CONFIG_SPL=y
--CONFIG_ENV_OFFSET_REDUND=0x280000
- CONFIG_SPL_SPI_FLASH_SUPPORT=y
- CONFIG_SPL_SPI_SUPPORT=y
- CONFIG_ARMV7_LPAE=y
--CONFIG_DEFAULT_DEVICE_TREE="am572x-idk"
-+CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15-revc"
- CONFIG_AHCI=y
- CONFIG_DISTRO_DEFAULTS=y
- CONFIG_SPL_LOAD_FIT=y
- # CONFIG_USE_SPL_FIT_GENERATOR is not set
- CONFIG_OF_BOARD_SETUP=y
-+CONFIG_BOOTDELAY=1
-+CONFIG_AUTOBOOT_KEYED=y
-+CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
-+CONFIG_AUTOBOOT_DELAY_STR="d"
-+CONFIG_AUTOBOOT_STOP_STR=" "
- CONFIG_USE_BOOTARGS=y
- CONFIG_BOOTARGS="androidboot.serialno=${serial#} console=ttyS2,115200 androidboot.console=ttyS2 androidboot.hardware=beagle_x15board"
- # CONFIG_USE_BOOTCOMMAND is not set
-@@ -48,13 +52,12 @@ CONFIG_BOOTP_DNS2=y
- CONFIG_CMD_AVB=y
- CONFIG_OF_CONTROL=y
- CONFIG_SPL_OF_CONTROL=y
--CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc am5729-beagleboneai am572x-idk am571x-idk am574x-idk"
-+CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am57xx-beagle-x15-revc am5729-beagleboneai"
- CONFIG_ENV_OVERWRITE=y
--CONFIG_ENV_IS_IN_MMC=y
--CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-+# CONFIG_ENV_IS_IN_FAT is not set
- CONFIG_SYS_RELOC_GD_ENV_ADDR=y
--CONFIG_SYS_MMC_ENV_DEV=1
- CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+# CONFIG_SPL_ENV_IS_NOWHERE is not set
- CONFIG_VERSION_VARIABLE=y
- CONFIG_BOOTP_SEND_HOSTNAME=y
- CONFIG_DM=y
-diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
-index f13e9e5264..eabd03e27d 100644
---- a/include/configs/ti_armv7_common.h
-+++ b/include/configs/ti_armv7_common.h
-@@ -92,6 +92,413 @@
- #define CONFIG_SYS_I2C
- #endif
- 
-+#define EEPROM_PROGRAMMING \
-+	"eeprom_dump=i2c dev 0; " \
-+		"i2c md 0x50 0x00.2 20; " \
-+		"\0" \
-+	"eeprom_blank=i2c dev 0; " \
-+		"i2c mw 0x50 0x00.2 ff; " \
-+		"i2c mw 0x50 0x01.2 ff; " \
-+		"i2c mw 0x50 0x02.2 ff; " \
-+		"i2c mw 0x50 0x03.2 ff; " \
-+		"i2c mw 0x50 0x04.2 ff; " \
-+		"i2c mw 0x50 0x05.2 ff; " \
-+		"i2c mw 0x50 0x06.2 ff; " \
-+		"i2c mw 0x50 0x07.2 ff; " \
-+		"i2c mw 0x50 0x08.2 ff; " \
-+		"i2c mw 0x50 0x09.2 ff; " \
-+		"i2c mw 0x50 0x0a.2 ff; " \
-+		"i2c mw 0x50 0x0b.2 ff; " \
-+		"i2c mw 0x50 0x0c.2 ff; " \
-+		"i2c mw 0x50 0x0d.2 ff; " \
-+		"i2c mw 0x50 0x0e.2 ff; " \
-+		"i2c mw 0x50 0x0f.2 ff; " \
-+		"i2c mw 0x50 0x10.2 ff; " \
-+		"i2c mw 0x50 0x11.2 ff; " \
-+		"i2c mw 0x50 0x12.2 ff; " \
-+		"i2c mw 0x50 0x13.2 ff; " \
-+		"i2c mw 0x50 0x14.2 ff; " \
-+		"i2c mw 0x50 0x15.2 ff; " \
-+		"i2c mw 0x50 0x16.2 ff; " \
-+		"i2c mw 0x50 0x17.2 ff; " \
-+		"i2c mw 0x50 0x18.2 ff; " \
-+		"i2c mw 0x50 0x19.2 ff; " \
-+		"i2c mw 0x50 0x1a.2 ff; " \
-+		"i2c mw 0x50 0x1b.2 ff; " \
-+		"i2c mw 0x50 0x1c.2 ff; " \
-+		"i2c mw 0x50 0x1d.2 ff; " \
-+		"i2c mw 0x50 0x1e.2 ff; " \
-+		"i2c mw 0x50 0x1f.2 ff; " \
-+		"i2c md 0x50 0x00.2 20; " \
-+		"\0" \
-+	"eeprom_x15_b1=i2c dev 0; " \
-+		"i2c mw 0x50 0x00.2 aa; " \
-+		"i2c mw 0x50 0x01.2 55; " \
-+		"i2c mw 0x50 0x02.2 33; " \
-+		"i2c mw 0x50 0x03.2 ee; " \
-+		"i2c mw 0x50 0x04.2 42; " \
-+		"i2c mw 0x50 0x05.2 42; " \
-+		"i2c mw 0x50 0x06.2 52; " \
-+		"i2c mw 0x50 0x07.2 44; " \
-+		"i2c mw 0x50 0x08.2 58; " \
-+		"i2c mw 0x50 0x09.2 31; " \
-+		"i2c mw 0x50 0x0a.2 35; " \
-+		"i2c mw 0x50 0x0b.2 5f; " \
-+		"i2c mw 0x50 0x0c.2 42; " \
-+		"i2c mw 0x50 0x0d.2 2e; " \
-+		"i2c mw 0x50 0x0e.2 31; " \
-+		"i2c mw 0x50 0x0f.2 30; " \
-+		"i2c mw 0x50 0x10.2 57; " \
-+		"i2c mw 0x50 0x11.2 57; " \
-+		"i2c mw 0x50 0x12.2 59; " \
-+		"i2c mw 0x50 0x13.2 59; " \
-+		"i2c mw 0x50 0x14.2 34; " \
-+		"i2c mw 0x50 0x15.2 50; " \
-+		"i2c mw 0x50 0x16.2 35; " \
-+		"i2c mw 0x50 0x17.2 35; " \
-+		"i2c mw 0x50 0x18.2 30; " \
-+		"i2c mw 0x50 0x19.2 30; " \
-+		"i2c mw 0x50 0x1a.2 30; " \
-+		"i2c mw 0x50 0x1b.2 30; " \
-+		"i2c mw 0x50 0x1c.2 ff; " \
-+		"i2c mw 0x50 0x1d.2 ff; " \
-+		"i2c mw 0x50 0x1e.2 ff; " \
-+		"i2c mw 0x50 0x1f.2 ff; " \
-+		"i2c md 0x50 0x00.2 20; " \
-+		"\0" \
-+	"eeprom_x15_c=i2c dev 0; " \
-+		"i2c mw 0x50 0x00.2 aa; " \
-+		"i2c mw 0x50 0x01.2 55; " \
-+		"i2c mw 0x50 0x02.2 33; " \
-+		"i2c mw 0x50 0x03.2 ee; " \
-+		"i2c mw 0x50 0x04.2 42; " \
-+		"i2c mw 0x50 0x05.2 42; " \
-+		"i2c mw 0x50 0x06.2 52; " \
-+		"i2c mw 0x50 0x07.2 44; " \
-+		"i2c mw 0x50 0x08.2 58; " \
-+		"i2c mw 0x50 0x09.2 31; " \
-+		"i2c mw 0x50 0x0a.2 35; " \
-+		"i2c mw 0x50 0x0b.2 5f; " \
-+		"i2c mw 0x50 0x0c.2 43; " \
-+		"i2c mw 0x50 0x0d.2 2e; " \
-+		"i2c mw 0x50 0x0e.2 30; " \
-+		"i2c mw 0x50 0x0f.2 30; " \
-+		"i2c mw 0x50 0x10.2 79; " \
-+		"i2c mw 0x50 0x11.2 79; " \
-+		"i2c mw 0x50 0x12.2 77; " \
-+		"i2c mw 0x50 0x13.2 77; " \
-+		"i2c mw 0x50 0x14.2 50; " \
-+		"i2c mw 0x50 0x15.2 58; " \
-+		"i2c mw 0x50 0x16.2 31; " \
-+		"i2c mw 0x50 0x17.2 35; " \
-+		"i2c mw 0x50 0x18.2 6e; " \
-+		"i2c mw 0x50 0x19.2 6e; " \
-+		"i2c mw 0x50 0x1a.2 6e; " \
-+		"i2c mw 0x50 0x1b.2 6e; " \
-+		"i2c mw 0x50 0x1c.2 ff; " \
-+		"i2c mw 0x50 0x1d.2 ff; " \
-+		"i2c mw 0x50 0x1e.2 ff; " \
-+		"i2c mw 0x50 0x1f.2 ff; " \
-+		"i2c md 0x50 0x00.2 20; " \
-+	"eeprom_bbai_a2=i2c dev 0; " \
-+		"i2c mw 0x50 0x00.2 aa; " \
-+		"i2c mw 0x50 0x01.2 55; " \
-+		"i2c mw 0x50 0x02.2 33; " \
-+		"i2c mw 0x50 0x03.2 ee; " \
-+		"i2c mw 0x50 0x04.2 42; " \
-+		"i2c mw 0x50 0x05.2 42; " \
-+		"i2c mw 0x50 0x06.2 4F; " \
-+		"i2c mw 0x50 0x07.2 4E; " \
-+		"i2c mw 0x50 0x08.2 45; " \
-+		"i2c mw 0x50 0x09.2 2D; " \
-+		"i2c mw 0x50 0x0a.2 41; " \
-+		"i2c mw 0x50 0x0b.2 49; " \
-+		"i2c mw 0x50 0x0c.2 30; " \
-+		"i2c mw 0x50 0x0d.2 30; " \
-+		"i2c mw 0x50 0x0e.2 41; " \
-+		"i2c mw 0x50 0x0f.2 32; " \
-+		"i2c mw 0x50 0x10.2 57; " \
-+		"i2c mw 0x50 0x11.2 57; " \
-+		"i2c mw 0x50 0x12.2 59; " \
-+		"i2c mw 0x50 0x13.2 59; " \
-+		"i2c mw 0x50 0x14.2 53; " \
-+		"i2c mw 0x50 0x15.2 42; " \
-+		"i2c mw 0x50 0x16.2 41; " \
-+		"i2c mw 0x50 0x17.2 49; " \
-+		"i2c mw 0x50 0x18.2 30; " \
-+		"i2c mw 0x50 0x19.2 30; " \
-+		"i2c mw 0x50 0x1a.2 30; " \
-+		"i2c mw 0x50 0x1b.2 30; " \
-+		"i2c mw 0x50 0x1c.2 30; " \
-+		"i2c mw 0x50 0x1d.2 30; " \
-+		"i2c mw 0x50 0x1e.2 ff; " \
-+		"i2c mw 0x50 0x1f.2 ff; " \
-+		"i2c md 0x50 0x00.2 20; " \
-+		"\0" \
-+
-+#define EEWIKI_MMC_BOOT \
-+	"mmc_boot=${devtype} dev ${mmcdev}; ${devtype} part; " \
-+		"if ${devtype} rescan; then " \
-+			"echo Scanning ${devtype} device ${mmcdev};" \
-+			"setenv bootpart ${mmcdev}:1; " \
-+			"echo Checking for: /uEnv.txt ...;" \
-+			"if test -e ${devtype} ${bootpart} /uEnv.txt; then " \
-+				"load ${devtype} ${bootpart} ${loadaddr} /uEnv.txt;" \
-+				"env import -t ${loadaddr} ${filesize};" \
-+				"echo Loaded environment from /uEnv.txt;" \
-+				"echo Checking if uenvcmd is set ...;" \
-+				"if test -n ${uenvcmd}; then " \
-+					"echo Running uenvcmd ...;" \
-+					"run uenvcmd;" \
-+				"fi;" \
-+			"fi; " \
-+			"echo Checking for: /boot/uEnv.txt ...;" \
-+			"for i in 1 2 3 4 5 6 7 ; do " \
-+				"setenv mmcpart ${i};" \
-+				"setenv bootpart ${mmcdev}:${mmcpart};" \
-+				"if test -e ${devtype} ${bootpart} /boot/uEnv.txt; then " \
-+					"load ${devtype} ${bootpart} ${loadaddr} /boot/uEnv.txt;" \
-+					"env import -t ${loadaddr} ${filesize};" \
-+					"echo Loaded environment from /boot/uEnv.txt;" \
-+					"if test -n ${dtb}; then " \
-+						"setenv fdtfile ${dtb};" \
-+						"echo debug: [dtb=${fdtfile}] ...;" \
-+					"fi;" \
-+					"echo Checking if uname_r is set in /boot/uEnv.txt ...;" \
-+					"if test -n ${uname_r}; then " \
-+						"echo debug: [uname_r=${uname_r}] ...;" \
-+						"setenv oldroot /dev/mmcblk${mmcdev}p${mmcpart};" \
-+						"run uname_boot;" \
-+					"fi;" \
-+				"fi;" \
-+			"done;" \
-+		"fi;\0" \
-+
-+#define EEWIKI_SCSI_BOOT \
-+	"scsi_boot=${devtype} reset ; " \
-+		"if ${devtype} dev ${mmcdev}; then " \
-+			"echo Scanning ${devtype} device ${mmcdev};" \
-+			"setenv bootpart ${mmcdev}:1; " \
-+			"echo Checking for: /uEnv.txt ...;" \
-+			"if test -e ${devtype} ${bootpart} /uEnv.txt; then " \
-+				"load ${devtype} ${bootpart} ${loadaddr} /uEnv.txt;" \
-+				"env import -t ${loadaddr} ${filesize};" \
-+				"echo Loaded environment from /uEnv.txt;" \
-+				"echo Checking if uenvcmd is set ...;" \
-+				"if test -n ${uenvcmd}; then " \
-+					"echo Running uenvcmd ...;" \
-+					"run uenvcmd;" \
-+				"fi;" \
-+			"fi; " \
-+			"echo Checking for: /boot/uEnv.txt ...;" \
-+			"for i in 1 2 3 4 ; do " \
-+				"setenv mmcpart ${i};" \
-+				"setenv bootpart ${mmcdev}:${mmcpart};" \
-+				"if test -e ${devtype} ${bootpart} /boot/uEnv.txt; then " \
-+					"load ${devtype} ${bootpart} ${loadaddr} /boot/uEnv.txt;" \
-+					"env import -t ${loadaddr} ${filesize};" \
-+					"echo Loaded environment from /boot/uEnv.txt;" \
-+					"if test -n ${dtb}; then " \
-+						"setenv fdtfile ${dtb};" \
-+						"echo debug: [dtb=${fdtfile}] ...;" \
-+					"fi;" \
-+					"echo Checking if uname_r is set in /boot/uEnv.txt ...;" \
-+					"if test -n ${uname_r}; then " \
-+						"echo debug: [uname_r=${uname_r}] ...;" \
-+						"setenv oldroot /dev/sda${mmcpart};" \
-+						"run uname_boot;" \
-+					"fi;" \
-+				"fi;" \
-+			"done;" \
-+		"fi;\0" \
-+
-+#define EEWIKI_USB_BOOT \
-+	"usb_boot=${devtype} reset ; " \
-+		"if ${devtype} dev ${mmcdev}; then " \
-+			"echo Scanning ${devtype} device ${mmcdev};" \
-+			"setenv bootpart ${mmcdev}:1; " \
-+			"echo Checking for: /uEnv.txt ...;" \
-+			"if test -e ${devtype} ${bootpart} /uEnv.txt; then " \
-+				"load ${devtype} ${bootpart} ${loadaddr} /uEnv.txt;" \
-+				"env import -t ${loadaddr} ${filesize};" \
-+				"echo Loaded environment from /uEnv.txt;" \
-+				"echo Checking if uenvcmd is set in /uEnv.txt ...;" \
-+				"if test -n ${uenvcmd}; then " \
-+					"echo Running uenvcmd ...;" \
-+					"run uenvcmd;" \
-+				"fi;" \
-+			"fi; " \
-+			"echo Checking for: /boot/uEnv.txt ...;" \
-+			"for i in 1 2 3 4 ; do " \
-+				"setenv mmcpart ${i};" \
-+				"setenv bootpart ${mmcdev}:${mmcpart};" \
-+				"if test -e ${devtype} ${bootpart} /boot/uEnv.txt; then " \
-+					"load ${devtype} ${bootpart} ${loadaddr} /boot/uEnv.txt;" \
-+					"env import -t ${loadaddr} ${filesize};" \
-+					"echo Loaded environment from /boot/uEnv.txt;" \
-+					"if test -n ${dtb}; then " \
-+						"setenv fdtfile ${dtb};" \
-+						"echo debug: [dtb=${fdtfile}] ...;" \
-+					"fi;" \
-+					"echo Checking if uname_r is set in /boot/uEnv.txt ...;" \
-+					"if test -n ${uname_r}; then " \
-+						"echo debug: [uname_r=${uname_r}] ...;" \
-+						"setenv oldroot /dev/sda${mmcpart};" \
-+						"run uname_boot;" \
-+					"fi;" \
-+				"fi;" \
-+			"done;" \
-+		"fi;\0" \
-+
-+#define EEWIKI_UNAME_BOOT \
-+	"uname_boot="\
-+		"setenv bootdir /boot; " \
-+		"setenv bootfile vmlinuz-${uname_r}; " \
-+		"if test -e ${devtype} ${bootpart} ${bootdir}/${bootfile}; then " \
-+			"echo loading ${bootdir}/${bootfile} ...; "\
-+			"run loadimage;" \
-+			"setenv fdtdir /boot/dtbs/${uname_r}; " \
-+			"if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \
-+				"run loadfdt;" \
-+			"else " \
-+				"setenv fdtdir /usr/lib/linux-image-${uname_r}; " \
-+				"if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \
-+					"run loadfdt;" \
-+				"else " \
-+					"setenv fdtdir /lib/firmware/${uname_r}/device-tree; " \
-+					"if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \
-+						"run loadfdt;" \
-+					"else " \
-+						"setenv fdtdir /boot/dtb-${uname_r}; " \
-+						"if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \
-+							"run loadfdt;" \
-+						"else " \
-+							"setenv fdtdir /boot/dtbs; " \
-+							"if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \
-+								"run loadfdt;" \
-+							"else " \
-+								"setenv fdtdir /boot/dtb; " \
-+								"if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \
-+									"run loadfdt;" \
-+								"else " \
-+									"setenv fdtdir /boot; " \
-+									"if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtfile}; then " \
-+										"run loadfdt;" \
-+									"else " \
-+										"echo; echo unable to find ${fdtfile} ...; echo booting legacy ...;"\
-+										"run args_mmc;" \
-+										"echo debug: [${bootargs}] ... ;" \
-+										"echo debug: [bootz ${loadaddr}] ... ;" \
-+										"bootz ${loadaddr}; " \
-+									"fi;" \
-+								"fi;" \
-+							"fi;" \
-+						"fi;" \
-+					"fi;" \
-+				"fi;" \
-+			"fi; " \
-+			"if test -n ${enable_uboot_overlays}; then " \
-+				"setenv fdt_buffer 0x60000;" \
-+				"if test -n ${uboot_fdt_buffer}; then " \
-+					"setenv fdt_buffer ${uboot_fdt_buffer};" \
-+				"fi;" \
-+				"echo uboot_overlays: [fdt_buffer=${fdt_buffer}] ... ;" \
-+				"if test -n ${uboot_overlay_addr0}; then " \
-+					"if test -n ${disable_uboot_overlay_addr0}; then " \
-+						"echo uboot_overlays: uboot loading of [${uboot_overlay_addr0}] disabled by /boot/uEnv.txt [disable_uboot_overlay_addr0=1]...;" \
-+					"else " \
-+						"setenv uboot_overlay ${uboot_overlay_addr0}; " \
-+						"run virtualloadoverlay;" \
-+					"fi;" \
-+				"fi;" \
-+				"if test -n ${uboot_overlay_addr1}; then " \
-+					"if test -n ${disable_uboot_overlay_addr1}; then " \
-+						"echo uboot_overlays: uboot loading of [${uboot_overlay_addr1}] disabled by /boot/uEnv.txt [disable_uboot_overlay_addr1=1]...;" \
-+					"else " \
-+						"setenv uboot_overlay ${uboot_overlay_addr1}; " \
-+						"run virtualloadoverlay;" \
-+					"fi;" \
-+				"fi;" \
-+				"if test -n ${uboot_overlay_addr2}; then " \
-+					"if test -n ${disable_uboot_overlay_addr2}; then " \
-+						"echo uboot_overlays: uboot loading of [${uboot_overlay_addr2}] disabled by /boot/uEnv.txt [disable_uboot_overlay_addr2=1]...;" \
-+					"else " \
-+						"setenv uboot_overlay ${uboot_overlay_addr2}; " \
-+						"run virtualloadoverlay;" \
-+					"fi;" \
-+				"fi;" \
-+				"if test -n ${uboot_overlay_addr3}; then " \
-+					"if test -n ${disable_uboot_overlay_addr3}; then " \
-+						"echo uboot_overlays: uboot loading of [${uboot_overlay_addr3}] disabled by /boot/uEnv.txt [disable_uboot_overlay_addr3=1]...;" \
-+					"else " \
-+						"setenv uboot_overlay ${uboot_overlay_addr3}; " \
-+						"run virtualloadoverlay;" \
-+					"fi;" \
-+				"fi;" \
-+				"if test -n ${uboot_overlay_addr4}; then " \
-+					"setenv uboot_overlay ${uboot_overlay_addr4}; " \
-+					"run virtualloadoverlay;" \
-+				"fi;" \
-+				"if test -n ${uboot_overlay_addr5}; then " \
-+					"setenv uboot_overlay ${uboot_overlay_addr5}; " \
-+					"run virtualloadoverlay;" \
-+				"fi;" \
-+				"if test -n ${uboot_overlay_addr6}; then " \
-+					"setenv uboot_overlay ${uboot_overlay_addr6}; " \
-+					"run virtualloadoverlay;" \
-+				"fi;" \
-+				"if test -n ${uboot_overlay_addr7}; then " \
-+					"setenv uboot_overlay ${uboot_overlay_addr7}; " \
-+					"run virtualloadoverlay;" \
-+				"fi;" \
-+				"if test -n ${uboot_overlay_pru}; then " \
-+					"setenv uboot_overlay ${uboot_overlay_pru}; " \
-+					"run virtualloadoverlay;" \
-+				"fi;" \
-+			"else " \
-+				"echo uboot_overlays: add [enable_uboot_overlays=1] to /boot/uEnv.txt to enable...;" \
-+			"fi;" \
-+			"setenv rdfile initrd.img-${uname_r}; " \
-+			"if test -e ${devtype} ${bootpart} ${bootdir}/${rdfile}; then " \
-+				"echo loading ${bootdir}/${rdfile} ...; "\
-+				"run loadrd;" \
-+				"if test -n ${netinstall_enable}; then " \
-+					"run args_netinstall; run message;" \
-+					"echo debug: [${bootargs}] ... ;" \
-+					"echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \
-+					"bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \
-+				"fi;" \
-+				"if test -n ${uenv_root}; then " \
-+					"run args_uenv_root;" \
-+					"echo debug: [${bootargs}] ... ;" \
-+					"echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \
-+					"bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \
-+				"fi;" \
-+				"if test -n ${uuid}; then " \
-+					"run args_mmc_uuid;" \
-+					"echo debug: [${bootargs}] ... ;" \
-+					"echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \
-+					"bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \
-+				"else " \
-+					"run args_mmc_old;" \
-+					"echo debug: [${bootargs}] ... ;" \
-+					"echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}] ... ;" \
-+					"bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \
-+				"fi;" \
-+			"else " \
-+				"if test -n ${uenv_root}; then " \
-+					"run args_uenv_root;" \
-+					"echo debug: [${bootargs}] ... ;" \
-+					"echo debug: [bootz ${loadaddr} - ${fdtaddr}] ... ;" \
-+					"bootz ${loadaddr} - ${fdtaddr}; " \
-+				"fi;" \
-+				"run args_mmc_old;" \
-+				"echo debug: [${bootargs}] ... ;" \
-+				"echo debug: [bootz ${loadaddr} - ${fdtaddr}] ... ;" \
-+				"bootz ${loadaddr} - ${fdtaddr}; " \
-+			"fi;" \
-+		"fi;\0" \
-+
- /*
-  * The following are general good-enough settings for U-Boot.  We set a
-  * large malloc pool as we generally have a lot of DDR, and we opt for
-diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
-index de0a6af2fd..0cd2ccea03 100644
---- a/include/configs/ti_omap5_common.h
-+++ b/include/configs/ti_omap5_common.h
-@@ -64,6 +64,11 @@
- 	DEFAULT_FIT_TI_ARGS \
- 	DEFAULT_COMMON_BOOT_TI_ARGS \
- 	DEFAULT_FDT_TI_ARGS \
-+	EEWIKI_USB_BOOT \
-+	EEWIKI_SCSI_BOOT \
-+	EEWIKI_MMC_BOOT \
-+	EEWIKI_UNAME_BOOT \
-+	EEPROM_PROGRAMMING \
- 	DFUARGS \
- 	NETARGS \
- 	NANDARGS \
-diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h
-index a9d8f28d46..1480b6e3df 100644
---- a/include/environment/ti/boot.h
-+++ b/include/environment/ti/boot.h
-@@ -132,6 +132,7 @@
- 	"bootpart=0:2\0" \
- 	"bootdir=/boot\0" \
- 	"bootfile=zImage\0" \
-+	"board_eeprom_header=undefined\0" \
- 	"usbtty=cdc_acm\0" \
- 	"vram=16M\0" \
- 	AVB_VERIFY_CMD \
-@@ -183,7 +184,14 @@
- 		"else " \
- 			"echo $apart partition not found; " \
- 			"exit; " \
--		"fi;\0"
-+		"fi;\0 " \
-+	"read_board_eeprom=" \
-+		"if test $board_eeprom_header = beagle_x15_revb1_blank; then " \
-+			"run eeprom_dump; run eeprom_x15_b1; reset; fi; " \
-+		"if test $board_eeprom_header = beagle_x15_revc_blank; then " \
-+			"run eeprom_dump; run eeprom_x15_c; reset; fi; " \
-+		"if test $board_eeprom_header = bbai_a2_blank; then " \
-+			"run eeprom_dump; run eeprom_bbai_a2; reset; fi;  \0 "
- 
- #ifdef CONFIG_OMAP54XX
- 
-@@ -223,19 +231,17 @@
- 			"echo WARNING: Could not determine device tree to use; fi; \0"
- 
- #define CONFIG_BOOTCOMMAND \
--	"if test ${dofastboot} -eq 1; then " \
--		"echo Boot fastboot requested, resetting dofastboot ...;" \
--		"setenv dofastboot 0; saveenv;" \
--		FASTBOOT_CMD \
--	"fi;" \
--	"if test ${boot_fit} -eq 1; then "	\
--		"run update_to_fit;"	\
--	"fi;"	\
-+	"run read_board_eeprom; " \
- 	"run findfdt; " \
--	"run envboot; " \
--	"run mmcboot;" \
--	"run emmc_linux_boot; " \
--	"run emmc_android_boot; " \
-+	"setenv mmcdev 0; " \
-+	"setenv devtype usb; " \
-+	"echo usb_boot is currently disabled;" \
-+	"setenv devtype scsi; " \
-+	"echo scsi_boot is currently disabled;" \
-+	"setenv devtype mmc; " \
-+	"run mmc_boot;" \
-+	"setenv mmcdev 1; " \
-+	"run mmc_boot;" \
- 	""
- 
- #endif /* CONFIG_OMAP54XX */
-diff --git a/include/environment/ti/mmc.h b/include/environment/ti/mmc.h
-index b86c8dc7a4..0ec09f279a 100644
---- a/include/environment/ti/mmc.h
-+++ b/include/environment/ti/mmc.h
-@@ -11,11 +11,31 @@
- #define DEFAULT_MMC_TI_ARGS \
- 	"mmcdev=0\0" \
- 	"mmcrootfstype=ext4 rootwait\0" \
--	"finduuid=part uuid mmc ${bootpart} uuid\0" \
-+	"finduuid=part uuid ${devtype} ${bootpart} uuid\0" \
- 	"args_mmc=run finduuid;setenv bootargs console=${console} " \
- 		"${optargs} " \
--		"root=PARTUUID=${uuid} rw " \
--		"rootfstype=${mmcrootfstype}\0" \
-+		"root=PARTUUID=${uuid} ro " \
-+		"rootfstype=${mmcrootfstype} " \
-+		"${cmdline}\0" \
-+	"args_mmc_old=setenv bootargs console=${console} " \
-+		"${optargs} " \
-+		"root=${oldroot} ro " \
-+		"rootfstype=${mmcrootfstype} " \
-+		"${cmdline}\0" \
-+	"args_mmc_uuid=setenv bootargs console=${console} " \
-+		"${optargs} " \
-+		"root=UUID=${uuid} ro " \
-+		"rootfstype=${mmcrootfstype} " \
-+		"${cmdline}\0" \
-+	"args_uenv_root=setenv bootargs console=${console} " \
-+		"${optargs} " \
-+		"root=${uenv_root} ro " \
-+		"rootfstype=${mmcrootfstype} " \
-+		"${musb} ${cmdline}\0" \
-+	"args_netinstall=setenv bootargs ${netinstall_bootargs} " \
-+		"${optargs} " \
-+		"root=/dev/ram rw " \
-+		"${cmdline}\0" \
- 	"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
- 	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
- 		"source ${loadaddr}\0" \
-@@ -24,7 +44,28 @@
- 		"env import -t ${loadaddr} ${filesize}\0" \
- 	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}\0" \
- 	"loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
--	"loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
-+	"loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}; setenv rdsize ${filesize}\0" \
-+	"loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
-+	"loadoverlay=echo uboot_overlays: loading ${actual_uboot_overlay} ...; " \
-+		"load ${devtype} ${bootpart} ${rdaddr} ${actual_uboot_overlay}; " \
-+		"fdt addr ${fdtaddr}; fdt resize ${fdt_buffer}; " \
-+		"fdt apply ${rdaddr}; fdt resize ${fdt_buffer};\0" \
-+	"virtualloadoverlay=if test -e ${devtype} ${bootpart} ${fdtdir}/overlays/${uboot_overlay}; then " \
-+				"setenv actual_uboot_overlay ${fdtdir}/overlays/${uboot_overlay}; " \
-+				"run loadoverlay;" \
-+			"else " \
-+				"if test -e ${devtype} ${bootpart} /lib/firmware/${uboot_overlay}; then " \
-+					"setenv actual_uboot_overlay /lib/firmware/${uboot_overlay}; " \
-+					"run loadoverlay;" \
-+				"else " \
-+					"if test -e ${devtype} ${bootpart} ${uboot_overlay}; then " \
-+						"setenv actual_uboot_overlay ${uboot_overlay}; " \
-+						"run loadoverlay;" \
-+					"else " \
-+						"echo uboot_overlays: unable to find [${devtype} ${bootpart} ${uboot_overlay}]...;" \
-+					"fi;" \
-+				"fi;" \
-+			"fi;\0" \
- 	"envboot=mmc dev ${mmcdev}; " \
- 		"if mmc rescan; then " \
- 			"echo SD/MMC found on device ${mmcdev};" \
--- 
-2.20.1
-

board/beaglev/extlinux.conf

@@ -1,4 +1,4 @@
 label linux
   kernel /boot/Image
-  devicetree /boot/jh7100-beaglev-starlight.dtb
+  devicetree /boot/starfive_vic7100_beagle_v.dtb
   append console=ttyS0,115200 earlyprintk root=PARTUUID=0fef845a-c6e1-45bc-82f7-002fa720f958 rootwait

board/beaglev/genimage.cfg

@@ -1,12 +1,12 @@
 image sdcard.img {
-	hdimage {
-		partition-table-type = "gpt"
-	}
+  hdimage {
+    gpt = true
+  }
 
-	partition rootfs {
-		partition-type-uuid = 72ec70a6-cf74-40e6-bd49-4bda08e8f224
-		partition-uuid = 0fef845a-c6e1-45bc-82f7-002fa720f958
-		bootable = "true"
-		image = "rootfs.ext4"
-	}
+  partition rootfs {
+    partition-type-uuid = 72ec70a6-cf74-40e6-bd49-4bda08e8f224
+    partition-uuid = 0fef845a-c6e1-45bc-82f7-002fa720f958
+    bootable = "true"
+    image = "rootfs.ext4"
+  }
 }

board/beaglev/patches/uboot/0001-include-configs-starfive-vic7100-adjust-fdt_addr_r.patch

@@ -0,0 +1,39 @@
+From 2c4c813940c577590f3352cef0c49a8def17905d Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Wed, 28 Apr 2021 22:58:45 +0200
+Subject: [PATCH] include/configs/starfive-vic7100: adjust fdt_addr_r
+
+The default fdt_addr_r of 0x88000000 doesn't work, the kernel never
+boots. Using 0x90000000 works fine.
+
+Since it would overlap with the kernel_comp_addr_r area, this one is
+moved 16 MB further, at 0x91000000.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ include/configs/starfive-vic7100.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/configs/starfive-vic7100.h b/include/configs/starfive-vic7100.h
+index 8c5915a73c..7150a23873 100644
+--- a/include/configs/starfive-vic7100.h
++++ b/include/configs/starfive-vic7100.h
+@@ -111,13 +111,13 @@
+ 	"fdt_high=0xffffffffffffffff\0" \
+ 	"initrd_high=0xffffffffffffffff\0" \
+ 	"kernel_addr_r=0x84000000\0" \
+-	"fdt_addr_r=0x88000000\0" \
++	"fdt_addr_r=0x90000000\0" \
+ 	"scriptaddr=0x88100000\0" \
+ 	"script_offset_f=0x1fff000\0" \
+ 	"script_size_f=0x1000\0" \
+ 	"pxefile_addr_r=0x88200000\0" \
+ 	"ramdisk_addr_r=0x88300000\0" \
+-	"kernel_comp_addr_r=0x90000000\0" \
++	"kernel_comp_addr_r=0x91000000\0" \
+ 	"kernel_comp_size=0x10000000\0" \
+ 	"type_guid_gpt_loader1=" TYPE_GUID_LOADER1 "\0" \
+ 	"type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
+-- 
+2.30.2
+

board/beaglev/post-build.sh

@@ -1,6 +1,12 @@
 #!/bin/sh
 BOARD_DIR=$(dirname $0)
 
+# The DTB to use is provided within the U-Boot source tree, so we grab
+# it from there, and install it to TARGET_DIR/boot/.
+eval $(make -C ${CONFIG_DIR} --no-print-directory QUOTED_VARS=YES VARS=UBOOT_DIR printvars)
+install -D -m0644 ${UBOOT_DIR}/arch/riscv/dts/starfive_vic7100_beagle_v.dtb \
+	${TARGET_DIR}/boot/starfive_vic7100_beagle_v.dtb
+
 # Bring the extlinux.conf file in.
 install -D -m 0644 ${BOARD_DIR}/extlinux.conf \
 	${TARGET_DIR}/boot/extlinux/extlinux.conf

board/beelink/gs1/genimage.cfg

@@ -6,7 +6,6 @@ image boot.vfat {
 			"extlinux"
 		}
 	}
-
 	size = 64M
 }
 
@@ -17,8 +16,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}
 
 	partition boot {

board/chromebook/elm/linux.config

@@ -30,6 +30,7 @@ CONFIG_SCHED_MC=y
 CONFIG_SCHED_SMT=y
 CONFIG_NR_CPUS=4
 CONFIG_NUMA=y
+CONFIG_SECCOMP=y
 CONFIG_PARAVIRT=y
 CONFIG_CRASH_DUMP=y
 CONFIG_COMPAT=y
@@ -45,7 +46,6 @@ CONFIG_ARM_CPUIDLE=y
 CONFIG_ARM_PSCI_CPUIDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
@@ -96,6 +96,7 @@ CONFIG_MTD_SST25L=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NAND_DENALI_DT=y
 CONFIG_MTD_SPI_NOR=y
+CONFIG_SPI_CADENCE_QUADSPI=y
 CONFIG_OF_OVERLAY=y
 # CONFIG_BLK_DEV is not set
 CONFIG_SRAM=y
@@ -115,39 +116,12 @@ CONFIG_DM_MIRROR=m
 CONFIG_DM_ZERO=m
 CONFIG_NETDEVICES=y
 # CONFIG_ETHERNET is not set
-CONFIG_PHYLIB=y
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_RTL8152=m
-CONFIG_USB_LAN78XX=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_HUAWEI_CDC_NCM=m
-CONFIG_USB_NET_CDC_MBIM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SR9700=m
-CONFIG_USB_NET_SR9800=m
-CONFIG_USB_NET_SMSC75XX=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_CX82310_ETH=m
-CONFIG_USB_NET_KALMIA=m
-CONFIG_USB_NET_QMI_WWAN=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_IPHETH=m
-CONFIG_USB_SIERRA_NET=m
-CONFIG_USB_VL600=m
-CONFIG_USB_NET_CH9200=m
-CONFIG_USB_NET_AQC111=m
+CONFIG_USB_RTL8152=y
+CONFIG_USB_USBNET=y
+# CONFIG_USB_NET_AX88179_178A is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_ZAURUS is not set
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
 # CONFIG_WLAN_VENDOR_ATH is not set
 # CONFIG_WLAN_VENDOR_ATMEL is not set
@@ -165,6 +139,7 @@ CONFIG_MWIFIEX_SDIO=m
 # CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
+CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_GPIO=y
@@ -205,9 +180,9 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_MT65XX=y
 CONFIG_I2C_RK3X=y
+CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_I2C_SLAVE=y
 CONFIG_SPI=y
-CONFIG_SPI_CADENCE_QUADSPI=y
 CONFIG_SPI_NXP_FLEXSPI=y
 CONFIG_SPI_GPIO=y
 CONFIG_SPI_MT65XX=y
@@ -226,6 +201,7 @@ CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_MAX77620=y
+CONFIG_POWER_AVS=y
 CONFIG_POWER_RESET_BRCMSTB=y
 CONFIG_POWER_RESET_XGENE=y
 CONFIG_POWER_RESET_SYSCON=y
@@ -369,6 +345,7 @@ CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_S5M=y
 CONFIG_RTC_DRV_DS3232=y
 CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_CROS_EC=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_DMADEVICES=y
 CONFIG_FSL_EDMA=y
@@ -378,14 +355,14 @@ CONFIG_MTK_CQDMA=y
 CONFIG_QCOM_HIDMA_MGMT=y
 CONFIG_QCOM_HIDMA=y
 # CONFIG_VIRTIO_MENU is not set
-CONFIG_CHROME_PLATFORMS=y
-CONFIG_CROS_EC=y
+CONFIG_MFD_CROS_EC=y
 CONFIG_CROS_EC_I2C=y
 CONFIG_CROS_EC_SPI=y
 CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_SCPI=y
 CONFIG_COMMON_CLK_CS2000_CP=y
 CONFIG_COMMON_CLK_S2MPS11=y
+CONFIG_CLK_QORIQ=y
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMMON_CLK_PWM=y
 CONFIG_COMMON_CLK_VC5=y
@@ -403,11 +380,17 @@ CONFIG_REMOTEPROC=y
 CONFIG_MTK_CMDQ=y
 CONFIG_MTK_PMIC_WRAP=y
 CONFIG_EXTCON_USB_GPIO=y
+CONFIG_EXTCON_USBC_CROS_EC=y
 CONFIG_IIO=y
 CONFIG_MAX9611=m
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
+CONFIG_IIO_CROS_EC_LIGHT_PROX=m
 CONFIG_SENSORS_ISL29018=m
+CONFIG_IIO_CROS_EC_BARO=m
 CONFIG_MPL3115=m
 CONFIG_PWM=y
+CONFIG_PWM_CROS_EC=m
 CONFIG_PWM_MTK_DISP=y
 CONFIG_PWM_MEDIATEK=y
 CONFIG_PHY_XGENE=y
@@ -434,13 +417,6 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_PSTORE=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_NFS_SWAP=y
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS2=y
-CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_SECURITY=y
@@ -474,4 +450,4 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_PREEMPT is not set
 CONFIG_STACKTRACE=y
 # CONFIG_FTRACE is not set
-# CONFIG_STRICT_DEVMEM is not set
+# CONFIG_STRICT_DEVMEM is not set

board/chromebook/elm/patches/linux/0001-drm-bridge_connector-Set-default-status-connected-fo.patch

@@ -0,0 +1,35 @@
+From 510d0ad0ce1b51c072309ba12dfb024fc2c3dbac Mon Sep 17 00:00:00 2001
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Date: Wed, 26 Aug 2020 10:15:22 +0200
+Subject: [PATCH 1/5] drm/bridge_connector: Set default status connected for
+ eDP connectors
+
+In an eDP application, HPD is not required and on most bridge chips
+useless. If HPD is not used, we need to set initial status as connected,
+otherwise the connector created by the drm_bridge_connector API remains
+in an unknown state.
+
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Acked-by: Sam Ravnborg <sam@ravnborg.org>
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Reviewed-by: Bilal Wasim <bwasim.lkml@gmail.com>
+Tested-by: Bilal Wasim <bwasim.lkml@gmail.com>
+---
+ drivers/gpu/drm/drm_bridge_connector.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/gpu/drm/drm_bridge_connector.c b/drivers/gpu/drm/drm_bridge_connector.c
+index c6994fe673f3..a58cbde59c34 100644
+--- a/drivers/gpu/drm/drm_bridge_connector.c
++++ b/drivers/gpu/drm/drm_bridge_connector.c
+@@ -187,6 +187,7 @@ drm_bridge_connector_detect(struct drm_connector *connector, bool force)
+ 		case DRM_MODE_CONNECTOR_DPI:
+ 		case DRM_MODE_CONNECTOR_LVDS:
+ 		case DRM_MODE_CONNECTOR_DSI:
++		case DRM_MODE_CONNECTOR_eDP:
+ 			status = connector_status_connected;
+ 			break;
+ 		default:
+-- 
+2.25.1
+

board/chromebook/elm/patches/linux/0002-drm-bridge-ps8640-Get-the-EDID-from-eDP-control.patch

@@ -0,0 +1,50 @@
+From cc0f2fea61fb34ca84e4812a615e0035d812aa8b Mon Sep 17 00:00:00 2001
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Date: Wed, 26 Aug 2020 10:15:23 +0200
+Subject: [PATCH 2/5] drm/bridge: ps8640: Get the EDID from eDP control
+
+The PS8640 DSI-to-eDP bridge can retrieve the EDID, so implement the
+.get_edid callback and set the flag to indicate the core to use it.
+
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Acked-by: Sam Ravnborg <sam@ravnborg.org>
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+---
+ drivers/gpu/drm/bridge/parade-ps8640.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c
+index 4b099196afeb..13755d278db6 100644
+--- a/drivers/gpu/drm/bridge/parade-ps8640.c
++++ b/drivers/gpu/drm/bridge/parade-ps8640.c
+@@ -242,8 +242,18 @@ static int ps8640_bridge_attach(struct drm_bridge *bridge,
+ 	return ret;
+ }
+ 
++static struct edid *ps8640_bridge_get_edid(struct drm_bridge *bridge,
++					   struct drm_connector *connector)
++{
++	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
++
++	return drm_get_edid(connector,
++			    ps_bridge->page[PAGE0_DP_CNTL]->adapter);
++}
++
+ static const struct drm_bridge_funcs ps8640_bridge_funcs = {
+ 	.attach = ps8640_bridge_attach,
++	.get_edid = ps8640_bridge_get_edid,
+ 	.post_disable = ps8640_post_disable,
+ 	.pre_enable = ps8640_pre_enable,
+ };
+@@ -294,6 +304,8 @@ static int ps8640_probe(struct i2c_client *client)
+ 
+ 	ps_bridge->bridge.funcs = &ps8640_bridge_funcs;
+ 	ps_bridge->bridge.of_node = dev->of_node;
++	ps_bridge->bridge.ops = DRM_BRIDGE_OP_EDID;
++	ps_bridge->bridge.type = DRM_MODE_CONNECTOR_eDP;
+ 
+ 	ps_bridge->page[PAGE0_DP_CNTL] = client;
+ 
+-- 
+2.25.1
+

board/chromebook/elm/patches/linux/0003-drm-bridge-ps8640-Return-an-error-for-incorrect-atta.patch

@@ -0,0 +1,35 @@
+From 62afc499fc46c8018f40733c31a675b28f0717d8 Mon Sep 17 00:00:00 2001
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Date: Wed, 26 Aug 2020 10:15:24 +0200
+Subject: [PATCH 3/5] drm/bridge: ps8640: Return an error for incorrect attach
+ flags
+
+Bridge drivers that implement the new model only shall return an error
+from their attach() handler when the DRM_BRIDGE_ATTACH_NO_CONNECTOR flag
+is not set. So make sure we return an error because only the new
+drm_bridge model is supported.
+
+Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+---
+ drivers/gpu/drm/bridge/parade-ps8640.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c
+index 13755d278db6..ce3e8b2da8c9 100644
+--- a/drivers/gpu/drm/bridge/parade-ps8640.c
++++ b/drivers/gpu/drm/bridge/parade-ps8640.c
+@@ -200,6 +200,10 @@ static int ps8640_bridge_attach(struct drm_bridge *bridge,
+ 						   .channel = 0,
+ 						   .node = NULL,
+ 						 };
++
++	if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR))
++		return -EINVAL;
++
+ 	/* port@0 is ps8640 dsi input port */
+ 	in_ep = of_graph_get_endpoint_by_regs(dev->of_node, 0, -1);
+ 	if (!in_ep)
+-- 
+2.25.1
+

board/chromebook/elm/patches/linux/0004-drm-bridge-ps8640-Print-an-error-if-VDO-control-fail.patch

@@ -0,0 +1,58 @@
+From 4897262a71cbf55d726d9174f5f646897dc13704 Mon Sep 17 00:00:00 2001
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Date: Wed, 26 Aug 2020 10:15:25 +0200
+Subject: [PATCH 4/5] drm/bridge: ps8640: Print an error if VDO control fails
+
+Print an error message inside ps8640_bridge_vdo_control() function when
+it fails so we can simplify a bit the callers, they will only need to
+check the error code.
+
+Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+---
+ drivers/gpu/drm/bridge/parade-ps8640.c | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c
+index ce3e8b2da8c9..9f7b7a9c53c5 100644
+--- a/drivers/gpu/drm/bridge/parade-ps8640.c
++++ b/drivers/gpu/drm/bridge/parade-ps8640.c
+@@ -82,8 +82,11 @@ static int ps8640_bridge_vdo_control(struct ps8640 *ps_bridge,
+ 	ret = i2c_smbus_write_i2c_block_data(client, PAGE3_SET_ADD,
+ 					     sizeof(vdo_ctrl_buf),
+ 					     vdo_ctrl_buf);
+-	if (ret < 0)
++	if (ret < 0) {
++		DRM_ERROR("failed to %sable VDO: %d\n",
++			  ctrl == ENABLE ? "en" : "dis", ret);
+ 		return ret;
++	}
+ 
+ 	return 0;
+ }
+@@ -150,10 +153,8 @@ static void ps8640_pre_enable(struct drm_bridge *bridge)
+ 	}
+ 
+ 	ret = ps8640_bridge_vdo_control(ps_bridge, ENABLE);
+-	if (ret) {
+-		DRM_ERROR("failed to enable VDO: %d\n", ret);
++	if (ret)
+ 		goto err_regulators_disable;
+-	}
+ 
+ 	/* Switch access edp panel's edid through i2c */
+ 	ret = i2c_smbus_write_byte_data(client, PAGE2_I2C_BYPASS,
+@@ -175,9 +176,7 @@ static void ps8640_post_disable(struct drm_bridge *bridge)
+ 	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
+ 	int ret;
+ 
+-	ret = ps8640_bridge_vdo_control(ps_bridge, DISABLE);
+-	if (ret < 0)
+-		DRM_ERROR("failed to disable VDO: %d\n", ret);
++	ps8640_bridge_vdo_control(ps_bridge, DISABLE);
+ 
+ 	gpiod_set_value(ps_bridge->gpio_reset, 1);
+ 	gpiod_set_value(ps_bridge->gpio_powerdown, 1);
+-- 
+2.25.1
+

board/chromebook/elm/patches/linux/0005-drm-bridge-ps8640-Rework-power-state-handling.patch

@@ -0,0 +1,162 @@
+From 5bb60fe7c748a0aae2bdbab10e73b2dc48c09dda Mon Sep 17 00:00:00 2001
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Date: Wed, 26 Aug 2020 10:15:26 +0200
+Subject: [PATCH 5/5] drm/bridge: ps8640: Rework power state handling
+
+The get_edid() callback can be triggered anytime by an ioctl, i.e
+
+  drm_mode_getconnector (ioctl)
+    -> drm_helper_probe_single_connector_modes
+       -> drm_bridge_connector_get_modes
+          -> ps8640_bridge_get_edid
+
+Actually if the bridge pre_enable() function was not called before
+get_edid(), the driver will not be able to get the EDID properly and
+display will not work until a second get_edid() call is issued and if
+pre_enable() is called before. The side effect of this, for example, is
+that you see anything when `Frecon` starts, neither the splash screen,
+until the graphical session manager starts.
+
+To fix this we need to make sure that all we need is enabled before
+reading the EDID. This means the following:
+
+1. If get_edid() is called before having the device powered we need to
+   power on the device. In such case, the driver will power off again the
+   device.
+
+2. If get_edid() is called after having the device powered, all should
+   just work. We added a powered flag in order to avoid recurrent calls
+   to ps8640_bridge_poweron() and unneeded delays.
+
+3. This seems to be specific for this device, but we need to make sure
+   the panel is powered on before do a power on cycle on this device.
+   Otherwise the device fails to retrieve the EDID.
+
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+---
+ drivers/gpu/drm/bridge/parade-ps8640.c | 64 +++++++++++++++++++++++---
+ 1 file changed, 58 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bridge/parade-ps8640.c
+index 9f7b7a9c53c5..c5d76e209bda 100644
+--- a/drivers/gpu/drm/bridge/parade-ps8640.c
++++ b/drivers/gpu/drm/bridge/parade-ps8640.c
+@@ -65,6 +65,7 @@ struct ps8640 {
+ 	struct regulator_bulk_data supplies[2];
+ 	struct gpio_desc *gpio_reset;
+ 	struct gpio_desc *gpio_powerdown;
++	bool powered;
+ };
+ 
+ static inline struct ps8640 *bridge_to_ps8640(struct drm_bridge *e)
+@@ -91,13 +92,15 @@ static int ps8640_bridge_vdo_control(struct ps8640 *ps_bridge,
+ 	return 0;
+ }
+ 
+-static void ps8640_pre_enable(struct drm_bridge *bridge)
++static void ps8640_bridge_poweron(struct ps8640 *ps_bridge)
+ {
+-	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
+ 	struct i2c_client *client = ps_bridge->page[PAGE2_TOP_CNTL];
+ 	unsigned long timeout;
+ 	int ret, status;
+ 
++	if (ps_bridge->powered)
++		return;
++
+ 	ret = regulator_bulk_enable(ARRAY_SIZE(ps_bridge->supplies),
+ 				    ps_bridge->supplies);
+ 	if (ret < 0) {
+@@ -164,6 +167,8 @@ static void ps8640_pre_enable(struct drm_bridge *bridge)
+ 		goto err_regulators_disable;
+ 	}
+ 
++	ps_bridge->powered = true;
++
+ 	return;
+ 
+ err_regulators_disable:
+@@ -171,12 +176,12 @@ static void ps8640_pre_enable(struct drm_bridge *bridge)
+ 			       ps_bridge->supplies);
+ }
+ 
+-static void ps8640_post_disable(struct drm_bridge *bridge)
++static void ps8640_bridge_poweroff(struct ps8640 *ps_bridge)
+ {
+-	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
+ 	int ret;
+ 
+-	ps8640_bridge_vdo_control(ps_bridge, DISABLE);
++	if (!ps_bridge->powered)
++		return;
+ 
+ 	gpiod_set_value(ps_bridge->gpio_reset, 1);
+ 	gpiod_set_value(ps_bridge->gpio_powerdown, 1);
+@@ -184,6 +189,28 @@ static void ps8640_post_disable(struct drm_bridge *bridge)
+ 				     ps_bridge->supplies);
+ 	if (ret < 0)
+ 		DRM_ERROR("cannot disable regulators %d\n", ret);
++
++	ps_bridge->powered = false;
++}
++
++static void ps8640_pre_enable(struct drm_bridge *bridge)
++{
++	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
++	int ret;
++
++	ps8640_bridge_poweron(ps_bridge);
++
++	ret = ps8640_bridge_vdo_control(ps_bridge, DISABLE);
++	if (ret < 0)
++		ps8640_bridge_poweroff(ps_bridge);
++}
++
++static void ps8640_post_disable(struct drm_bridge *bridge)
++{
++	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
++
++	ps8640_bridge_vdo_control(ps_bridge, DISABLE);
++	ps8640_bridge_poweroff(ps_bridge);
+ }
+ 
+ static int ps8640_bridge_attach(struct drm_bridge *bridge,
+@@ -249,9 +276,34 @@ static struct edid *ps8640_bridge_get_edid(struct drm_bridge *bridge,
+ 					   struct drm_connector *connector)
+ {
+ 	struct ps8640 *ps_bridge = bridge_to_ps8640(bridge);
++	bool poweroff = !ps_bridge->powered;
++	struct edid *edid;
++
++	/*
++	 * When we end calling get_edid() triggered by an ioctl, i.e
++	 *
++	 *   drm_mode_getconnector (ioctl)
++	 *     -> drm_helper_probe_single_connector_modes
++	 *        -> drm_bridge_connector_get_modes
++	 *           -> ps8640_bridge_get_edid
++	 *
++	 * We need to make sure that what we need is enabled before reading
++	 * EDID, for this chip, we need to do a full poweron, otherwise it will
++	 * fail.
++	 */
++	drm_bridge_chain_pre_enable(bridge);
+ 
+-	return drm_get_edid(connector,
++	edid = drm_get_edid(connector,
+ 			    ps_bridge->page[PAGE0_DP_CNTL]->adapter);
++
++	/*
++	 * If we call the get_edid() function without having enabled the chip
++	 * before, return the chip to its original power state.
++	 */
++	if (poweroff)
++		drm_bridge_chain_post_disable(bridge);
++
++	return edid;
+ }
+ 
+ static const struct drm_bridge_funcs ps8640_bridge_funcs = {
+-- 
+2.25.1
+

board/chromebook/elm/patches/linux/0006-Revert-drm-mediatek-dsi-Fix-scrolling-of-panel-with-.patch

@@ -0,0 +1,41 @@
+From 51109530891c981b681816152bd205724deabcca Mon Sep 17 00:00:00 2001
+From: Jitao Shi <jitao.shi@mediatek.com>
+Date: Sat, 10 Oct 2020 15:09:09 +0800
+Subject: [PATCH] Revert "drm/mediatek: dsi: Fix scrolling of panel with small
+ hfp or hbp"
+
+This reverts commit 35bf948f1edbf507f6e57e0879fa6ea36d2d2930.
+
+Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
+Reviewed-by: Bilal Wasim <bilal.wasim@imgtec.com>
+Tested-by: Bilal Wasim <bilal.wasim@imgtec.com>
+---
+ drivers/gpu/drm/mediatek/mtk_dsi.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
+index 80b7a082e874..16fd99dcdacf 100644
+--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
++++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
+@@ -466,13 +466,14 @@ static void mtk_dsi_config_vdo_timing(struct mtk_dsi *dsi)
+ 	horizontal_sync_active_byte = (vm->hsync_len * dsi_tmp_buf_bpp - 10);
+ 
+ 	if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_SYNC_PULSE)
+-		horizontal_backporch_byte = vm->hback_porch * dsi_tmp_buf_bpp;
++		horizontal_backporch_byte =
++			(vm->hback_porch * dsi_tmp_buf_bpp - 10);
+ 	else
+-		horizontal_backporch_byte = (vm->hback_porch + vm->hsync_len) *
+-					    dsi_tmp_buf_bpp;
++		horizontal_backporch_byte = ((vm->hback_porch + vm->hsync_len) *
++			dsi_tmp_buf_bpp - 10);
+ 
+ 	data_phy_cycles = timing->lpx + timing->da_hs_prepare +
+-			  timing->da_hs_zero + timing->da_hs_exit;
++			  timing->da_hs_zero + timing->da_hs_exit + 3;
+ 
+ 	if (dsi->mode_flags & MIPI_DSI_MODE_VIDEO_BURST) {
+ 		if ((vm->hfront_porch + vm->hback_porch) * dsi_tmp_buf_bpp >
+-- 
+2.25.1
+

board/ci20/genimage.cfg

@@ -1,28 +1,28 @@
 image sdcard.img {
-	hdimage {
-	}
+    hdimage {
+    }
 
-	partition uboot-spl {
-		in-partition-table = "no"
-		image = "u-boot-spl.bin"
-		offset = 512
-	}
+    partition uboot-spl {
+        in-partition-table = "no"
+        image = "u-boot-spl.bin"
+        offset = 512
+    }
 
-	partition uboot {
-		in-partition-table = "no"
-		image = "u-boot.img"
-		offset = 14K
-	}
+    partition uboot {
+        in-partition-table = "no"
+        image = "u-boot.img"
+        offset = 14k
+    }
 
-	partition uboot-env {
-		in-partition-table = "no"
-		image = "uboot-env.bin"
-		offset = 526K
-	}
+    partition uboot-env {
+        in-partition-table = "no"
+        image = "uboot-env.bin"
+        offset = 526k
+    }
 
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		offset = 2M
-	}
+    partition rootfs {
+        partition-type = 0x83
+        image = "rootfs.ext4"
+        offset = 2M
+    }
 }

board/cubietech/cubieboard2/genimage.cfg

@@ -9,7 +9,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }
 
@@ -20,8 +19,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}
 
 	partition boot {

board/embest/riotboard/genimage.cfg

@@ -1,17 +1,17 @@
 image sdcard.img {
-	hdimage {
-	}
+    hdimage {
+    }
 
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.imx"
-		offset = 1K
-	}
+    partition u-boot {
+        in-partition-table = "no"
+        image = "u-boot.imx"
+        offset = 1024
+    }
 
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext2"
-		offset = 1M
-		size = 60M
-	}
+    partition rootfs {
+        partition-type = 0x83
+        image = "rootfs.ext2"
+        offset = 1M
+        size = 60M
+    }
 }

board/engicam/geam6ul/genimage.cfg

@@ -5,7 +5,6 @@ image boot.vfat {
 			"imx6ul-geam-kit.dtb"
 		}
 	}
-
 	size = 64M
 }
 
@@ -16,7 +15,7 @@ image sdcard.img {
 	partition SPL {
 		in-partition-table = "no"
 		image = "SPL"
-		offset = 1K
+		offset = 1024
 	}
 
 	partition u-boot-dtb {

board/engicam/icorem6/genimage.cfg

@@ -8,7 +8,6 @@ image boot.vfat {
 			"imx6q-icore-ofcap12.dtb"
 		}
 	}
-
 	size = 64M
 }
 
@@ -19,7 +18,7 @@ image sdcard.img {
 	partition SPL {
 		in-partition-table = "no"
 		image = "SPL"
-		offset = 1K
+		offset = 1024
 	}
 
 	partition u-boot-dtb {

board/engicam/icorem6_rqs/genimage.cfg

@@ -6,7 +6,6 @@ image boot.vfat {
 			"imx6q-icore-rqs.dtb"
 		}
 	}
-
 	size = 64M
 }
 
@@ -17,7 +16,7 @@ image sdcard.img {
 	partition SPL {
 		in-partition-table = "no"
 		image = "SPL"
-		offset = 1K
+		offset = 1024
 	}
 
 	partition u-boot-dtb {

board/engicam/isiot/genimage.cfg

@@ -5,7 +5,6 @@ image boot.vfat {
 			"imx6ul-isiot-emmc.dtb"
 		}
 	}
-
 	size = 64M
 }
 
@@ -16,7 +15,7 @@ image sdcard.img {
 	partition SPL {
 		in-partition-table = "no"
 		image = "SPL"
-		offset = 1K
+		offset = 1024
 	}
 
 	partition u-boot-dtb {

board/freescale/common/imx/genimage.cfg.template_no_boot_part

@@ -1,16 +0,0 @@
-image sdcard.img {
-  hdimage {
-  }
-
-  partition u-boot {
-    in-partition-table = "no"
-    image = "%UBOOTBIN%"
-    offset = 1024
-  }
-
-  partition rootfs {
-    partition-type = 0x83
-    image = "rootfs.ext2"
-    offset = 8M
-  }
-}

board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl

@@ -26,6 +26,5 @@ image sdcard.img {
   partition rootfs {
     partition-type = 0x83
     image = "rootfs.ext2"
-    offset = 8M
   }
 }

board/freescale/common/imx/post-image.sh

@@ -25,8 +25,6 @@ linux_image()
 		echo "\"uImage\""
 	elif grep -Eq "^BR2_LINUX_KERNEL_IMAGE=y$" ${BR2_CONFIG}; then
 		echo "\"Image\""
-	elif grep -Eq "^BR2_LINUX_KERNEL_IMAGEGZ=y$" ${BR2_CONFIG}; then
-		echo "\"Image.gz\""
 	else
 		echo "\"zImage\""
 	fi
@@ -49,8 +47,6 @@ genimage_type()
 	elif grep -Eq "^BR2_LINUX_KERNEL_INSTALL_TARGET=y$" ${BR2_CONFIG}; then
 		if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
 		    echo "genimage.cfg.template_no_boot_part_spl"
-		else
-		    echo "genimage.cfg.template_no_boot_part"
 		fi
 	elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
 		echo "genimage.cfg.template_spl"

board/freescale/imx7dsdb/rootfs_overlay/boot/extlinux/extlinux.conf

@@ -1,4 +0,0 @@
-Label imx7d-sabresd-buildroot
-  kernel /boot/zImage
-  devicetree /boot/imx7d-sdb.dtb
-  append root=PARTUUID=${uuid} rootwait rw console=${console},${baudrate}

board/friendlyarm/nanopc-t4/genimage.cfg

@@ -1,39 +1,39 @@
 image boot.vfat {
-	vfat {
-		files = {
-			"Image",
-			"rk3399-nanopc-t4.dtb",
-			"extlinux"
-		}
-	}
-
-	size = 64M
+        vfat {
+                files = {
+                        "Image",
+                        "rk3399-nanopc-t4.dtb",
+                        "extlinux"
+                }
+        }
+        size = 64M
 }
 
 image sdcard.img {
-	hdimage {
-		partition-table-type = "gpt"
-	}
 
-	partition loader1 {
-		image = "idbloader.img"
-		offset = 32K
-	}
+        hdimage {
+                gpt = true
+        }
 
-	partition loader2 {
-		image = "u-boot.itb"
-		offset = 8M
-	}
+        partition loader1 {
+                image = "idbloader.img"
+                offset = 32K
+        }
 
-	partition boot {
-		partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 16M
-	}
+        partition loader2 {
+                image = "u-boot.itb"
+                offset = 8M
+        }
 
-	partition rootfs {
-		partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae
-		image = "rootfs.ext4"
-	}
+        partition boot {
+                partition-type = 0xC
+                bootable = "true"
+                image = "boot.vfat"
+                offset = 16M
+        }
+
+        partition rootfs {
+                partition-type = 0x83
+                image = "rootfs.ext4"
+        }
 }

board/friendlyarm/nanopi-a64/genimage.cfg

@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }
 
@@ -17,14 +16,14 @@ image sdcard.img {
 	partition spl {
 		in-partition-table = "no"
 		image = "sunxi-spl.bin"
-		offset = 8K
+		offset = 8192
 	}
 
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot.itb"
 		offset = 40K
-		size = 1M # 1MB - 40KB
+		size = 1M # 1MB - 40K
 	}
 
 	partition boot {

board/friendlyarm/nanopi-m1-plus/genimage.cfg

@@ -8,7 +8,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }
 
@@ -19,8 +18,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}
 
 	partition boot {

board/friendlyarm/nanopi-m1/genimage.cfg

@@ -8,7 +8,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }
 
@@ -19,8 +18,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}
 
 	partition boot {

board/friendlyarm/nanopi-m4/genimage.cfg

@@ -6,13 +6,13 @@ image boot.vfat {
 			"extlinux"
 		}
 	}
-
 	size = 64M
 }
 
 image sdcard.img {
+
 	hdimage {
-		partition-table-type = "gpt"
+		gpt = true
 	}
 
 	partition loader1 {
@@ -26,14 +26,14 @@ image sdcard.img {
 	}
 
 	partition boot {
-		partition-type-uuid = c12a7328-f81f-11d2-ba4b-00a0c93ec93b
+		partition-type = 0xC
 		bootable = "true"
 		image = "boot.vfat"
 		offset = 16M
 	}
 
 	partition rootfs {
-		partition-type-uuid = b921b045-1df0-41c3-af44-4c6f280d3fae
+		partition-type = 0x83
 		image = "rootfs.ext4"
 	}
 }

board/friendlyarm/nanopi-neo-plus2/genimage.cfg

@@ -6,7 +6,6 @@ image boot.vfat {
 			"extlinux"
 		}
 	}
-
 	size = 64M
 }
 
@@ -17,14 +16,14 @@ image sdcard.img {
 	partition spl {
 		in-partition-table = "no"
 		image = "sunxi-spl.bin"
-		offset = 8K
+		offset = 8192
 	}
 
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot.itb"
 		offset = 40K
-		size = 1M # 1MB - 40KB
+		size = 1M # 1MB - 40K
 	}
 
 	partition boot {

board/friendlyarm/nanopi-neo/genimage.cfg

@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }
 
@@ -17,8 +16,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}
 
 	partition boot {

board/friendlyarm/nanopi-neo2/genimage.cfg

@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }
 
@@ -17,14 +16,14 @@ image sdcard.img {
 	partition spl {
 		in-partition-table = "no"
 		image = "sunxi-spl.bin"
-		offset = 8K
+		offset = 8192
 	}
 
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot.itb"
 		offset = 40K
-		size = 1M # 1MB - 40KB
+		size = 1M # 1MB - 40K
 	}
 
 	partition boot {

board/friendlyarm/nanopi-r1/genimage.cfg

@@ -8,7 +8,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 10M
 }
 
@@ -19,8 +18,8 @@ image sdcard.img {
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
-		offset = 8K
-		size = 1016K # 1MB - 8KB
+		offset = 8192
+		size = 1040384 # 1MB - 8192
 	}
 
 	partition boot {

board/friendlyarm/nanopi-r2s/extlinux.conf

@@ -1,4 +0,0 @@
-label NanoPi R2S linux
-  kernel /boot/Image
-  devicetree /boot/rk3328-nanopi-r2s.dtb
-  append root=/dev/mmcblk0p1 rw rootwait

board/friendlyarm/nanopi-r2s/genimage.cfg

@@ -1,22 +0,0 @@
-image sdcard.img {
-	hdimage {
-	}
-
-	partition u-boot-tpl-spl-dtb {
-		in-partition-table = "no"
-		image = "idbloader.img"
-		offset = 32K
-	}
-
-	partition u-boot-dtb {
-		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 8M
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		offset = 16M
-		image = "rootfs.ext4"
-	}
-}

board/friendlyarm/nanopi-r2s/post-build.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname $0)"
-
-install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf

board/friendlyarm/nanopi-r2s/readme.txt

@@ -1,57 +0,0 @@
-Intro
-=====
-
-This default configuration will allow you to start experimenting with the
-buildroot environment for the Nanopi R2S. With the current configuration
-it will bring-up the board, and allow access through the serial console.
-
-Nanopi R2S link:
-https://www.friendlyarm.com/index.php?route=product/product&path=69&product_id=282
-
-This configuration uses ATF, U-Boot mainline and kernel mainline.
-
-How to build
-============
-
-    $ make friendlyarm_nanopi_r2s_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-Files created in output directory
-=================================
-
-output/images
-
-├── bl31.elf
-├── boot.vfat
-├── extlinux
-├── idbloader.img
-├── Image
-├── rk3328-nanopi-r2s.dtb
-├── rootfs.ext2
-├── rootfs.ext4 -> rootfs.ext2
-├── rootfs.tar
-├── sdcard.img
-├── u-boot.bin
-└── u-boot.itb
-
-How to write the SD card
-========================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-  $ sudo sync
-
-Insert the micro SDcard in your Nanopi R2S and power it up. The console
-is on the serial line, 1500000 8N1.
-
-Notes
-=====
-
-This configuration can also be used to drive the Friendlyarm Nanopi Neo3 board.

board/grinn/chiliboard/genimage.cfg

@@ -2,31 +2,30 @@
 #
 
 image boot.vfat {
-	vfat {
-		files = {
-			"MLO",
-			"u-boot.img",
-			"am335x-chiliboard.dtb",
-			"zImage"
-		}
-	}
-
-	size = 16M
+  vfat {
+    files = {
+      "MLO",
+      "u-boot.img",
+      "am335x-chiliboard.dtb",
+      "zImage"
+    }
+  }
+  size = 16M
 }
 
 image sdcard.img {
-	hdimage {
-	}
+  hdimage {
+  }
 
-	partition u-boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 1M
-	}
+  partition u-boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+    offset = 1M
+  }
 
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
 }

board/grinn/liteboard/genimage.cfg

@@ -9,41 +9,40 @@
 #
 
 image boot.vfat {
-	vfat {
-		files = {
-			"imx6ul-liteboard.dtb",
-			"zImage"
-		}
-	}
-
-	size = 16M
+  vfat {
+    files = {
+      "imx6ul-liteboard.dtb",
+      "zImage"
+    }
+  }
+  size = 16M
 }
 
 image sdcard.img {
-	hdimage {
-	}
+  hdimage {
+  }
 
-	partition SPL {
-		in-partition-table = "no"
-		image = "SPL"
-		offset = 1K
-	}
+  partition SPL {
+    in-partition-table = "no"
+    image = "SPL"
+    offset = 1K
+  }
 
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.img"
-		offset = 69K
-	}
+  partition u-boot {
+    in-partition-table = "no"
+    image = "u-boot.img"
+    offset = 69K
+  }
 
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 8M
-	}
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+    offset = 8M
+  }
 
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
 }

board/hardkernel/odroidc2/genimage.cfg

@@ -6,7 +6,6 @@ image boot.vfat {
 			"boot.scr"
 		}
 	}
-
 	size = 64M
 }
 
@@ -18,13 +17,12 @@ image sdcard.img {
 		in-partition-table = "no"
 		image = "bl1.bin.hardkernel"
 		offset = 0
-		holes = {"(440; 512)"}
 	}
 
 	partition u-boot {
 		in-partition-table = "no"
 		image = "uboot-odc2.img"
-		offset = 49664 # 48KB + 512B
+		offset = 49664
 	}
 
 	partition boot {

board/hardkernel/odroidxu4/genimage.cfg

@@ -6,7 +6,6 @@ image boot.vfat {
 			"exynos5422-odroidxu4.dtb"
 		}
 	}
-
 	size = 32M
 }
 
@@ -18,34 +17,34 @@ image sdcard.img {
 		in-partition-table = "no"
 		image = "bl1.bin.hardkernel"
 		offset = 512
-		size = 15K
+		size = 15360
 	}
 
 	partition bl2 {
 		in-partition-table = "no"
 		image = "bl2.bin.hardkernel.720k_uboot"
-		offset = 15872 # 15KB + 512B
-		size = 16K
+		offset = 15872
+		size = 16384
 	}
 
 	partition u-boot {
 		in-partition-table = "no"
 		image = "u-boot-dtb.bin"
-		offset = 32256 # 31KB + 512B
-		size = 720K
+		offset = 32256
+		size = 720k
 	}
 
 	partition tzsw {
 		in-partition-table = "no"
 		image = "tzsw.bin.hardkernel"
-		offset = 769536 # 751KB + 512B
-		size = 256K
+		offset = 769536
+		size = 256k
 	}
 
 	partition vfat {
 		partition-type = 0xC
 		image = "boot.vfat"
-		offset = 2M
+		offset = 2097152
 	}
 
 	partition rootfs {

board/intel/galileo/genimage.cfg

@@ -1,12 +1,14 @@
 # Create an image of the efi partition
 image efi-part.vfat {
 	vfat {
+		file startup.nsh {
+			image = "efi-part/startup.nsh"
+		}
 		file EFI {
 			image = "efi-part/EFI"
 		}
 	}
-
-	size = 512K
+	size=512K
 }
 
 # Create the sdcard image, pulling in

board/intel/galileo/patches/linux/0001-x86-relocs-Make-per_cpu_load_addr-static.patch

@@ -1,39 +0,0 @@
-From eeeda4cd06e828b331b15741a204ff9f5874d28d Mon Sep 17 00:00:00 2001
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Wed, 24 Sep 2014 13:30:12 +0100
-Subject: [PATCH] x86/relocs: Make per_cpu_load_addr static
-
-per_cpu_load_addr is only used for 64-bit relocations, but is
-declared in both configurations of relocs.c - with different
-types.  This has undefined behaviour in general.  GNU ld is
-documented to use the larger size in this case, but other tools
-may differ and some warn about this.
-
-References: https://bugs.debian.org/748577
-Reported-by: Michael Tautschnig <mt@debian.org>
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-Cc: 748577@bugs.debian.org
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Link: http://lkml.kernel.org/r/1411561812.3659.23.camel@decadent.org.uk
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
----
- arch/x86/tools/relocs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
-index bbb1d2259ecf..a5efb21d5228 100644
---- a/arch/x86/tools/relocs.c
-+++ b/arch/x86/tools/relocs.c
-@@ -695,7 +695,7 @@ static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
-  *
-  */
- static int per_cpu_shndx	= -1;
--Elf_Addr per_cpu_load_addr;
-+static Elf_Addr per_cpu_load_addr;
- 
- static void percpu_init(void)
- {
--- 
-2.25.1
-

board/kontron/bl-imx8mm/extlinux.conf

@@ -1,4 +0,0 @@
-label buildroot
-  kernel /boot/Image
-  devicetree /boot/freescale/imx8mm-kontron-n801x-s.dtb
-  append root=PARTUUID=%PARTUUID% rootwait rw

board/kontron/bl-imx8mm/genimage.cfg

@@ -1,18 +0,0 @@
-image sdcard.img {
-	hdimage {
-		partition-table-type = "gpt"
-		gpt-location = 16K
-	}
-
-	partition imx-boot {
-		in-partition-table = "no"
-		image = "flash.bin"
-		offset = 33K
-	}
-
-	partition rootfs {
-		image = "rootfs.ext4"
-		offset = 8M
-		partition-uuid = %PARTUUID%
-	}
-}

board/kontron/bl-imx8mm/patches/uboot/0001-imx-imx8mm-imx8mm-kontron-n801x-s-convert-options-to.patch

@@ -1,31 +0,0 @@
-From 95a311af81cd47c44d3d6e3f717f06a06d8f3dfd Mon Sep 17 00:00:00 2001
-From: Heiko Thiery <heiko.thiery@gmail.com>
-Date: Mon, 10 Jan 2022 14:13:02 +0100
-Subject: [PATCH 1/2] imx: imx8mm: imx8mm-kontron-n801x-s: convert options to Kconfig
-
-CONFIG_SPL_MMC and CONFIG_SPL_SERIAL
-
-Patch submitted upstream:
-https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-1-heiko.thiery@gmail.com/
-
-Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
----
- configs/kontron-sl-mx8mm_defconfig | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig
-index 35d12fca32..940bf07a92 100644
---- a/configs/kontron-sl-mx8mm_defconfig
-+++ b/configs/kontron-sl-mx8mm_defconfig
-@@ -15,6 +15,8 @@ CONFIG_SPL_DM_SPI=y
- CONFIG_DEFAULT_DEVICE_TREE="imx8mm-kontron-n801x-s"
- CONFIG_SPL_TEXT_BASE=0x7E1000
- CONFIG_TARGET_KONTRON_MX8MM=y
-+CONFIG_SPL_MMC=y
-+CONFIG_SPL_SERIAL=y
- CONFIG_BOOTCOUNT_BOOTLIMIT=3
- CONFIG_SPL=y
- CONFIG_DISTRO_DEFAULTS=y
--- 
-2.30.2
-

board/kontron/bl-imx8mm/patches/uboot/0002-imx-imx8mm-imx8mm-kontron-n801x-s-add-common-board-u.patch

@@ -1,305 +0,0 @@
-From ef694c19c074333fd16589ec6ffef3e7ca895186 Mon Sep 17 00:00:00 2001
-From: Heiko Thiery <heiko.thiery@gmail.com>
-Date: Wed, 12 Jan 2022 08:44:36 +0100
-Subject: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: add common board
- u-boot.dtsi
-
-When using a board variant that selects the lvds specific dtb the
-*.u-boot.dtsi file will not be included. To have a lvds dtb specific
-u-boot.dtsi file move this part to a common board u-boot.dtsi file and
-include this in the board base u-boot.dtsi and create an additional one
-for the lvds variant.
-
-Patch submitted upstream:
-https://patchwork.ozlabs.org/project/uboot/patch/20220112085755.7396-2-heiko.thiery@gmail.com/
-
-Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
----
- .../imx8mm-kontron-n801x-s-lvds-u-boot.dtsi   |   6 +
- .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi    | 124 +----------------
- arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 128 ++++++++++++++++++
- 3 files changed, 135 insertions(+), 123 deletions(-)
- create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi
- create mode 100644 arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi
-
-diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi
-new file mode 100644
-index 0000000000..4bf75722bf
---- /dev/null
-+++ b/arch/arm/dts/imx8mm-kontron-n801x-s-lvds-u-boot.dtsi
-@@ -0,0 +1,6 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * Copyright (C) 2019 Kontron Electronics GmbH
-+ */
-+
-+#include "imx8mm-kontron-n801x-u-boot.dtsi"
-diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi
-index 22d18e6f1c..4bf75722bf 100644
---- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi
-+++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi
-@@ -3,126 +3,4 @@
-  * Copyright (C) 2019 Kontron Electronics GmbH
-  */
- 
--#include "imx8mm-u-boot.dtsi"
--
--/ {
--	aliases {
--		usb0 = &usbotg1;
--		usb1 = &usbotg2;
--	};
--
--	wdt-reboot {
--		compatible = "wdt-reboot";
--		wdt = <&wdog1>;
--		u-boot,dm-spl;
--	};
--
--	firmware {
--		optee {
--			compatible = "linaro,optee-tz";
--			method = "smc";
--		};
--	};
--};
--
--&fec1 {
--	phy-mode = "rgmii-rxid";
--};
--
--&i2c1 {
--	u-boot,dm-spl;
--	u-boot,dm-pre-reloc;
--};
--
--&i2c2 {
--	status = "okay";
--	u-boot,dm-spl;
--	u-boot,dm-pre-reloc;
--};
--
--&pinctrl_ecspi1 {
--	u-boot,dm-spl;
--};
--
--&pinctrl_i2c1 {
--	u-boot,dm-spl;
--};
--
--&pinctrl_pmic {
--	u-boot,dm-spl;
--	fsl,pins = <
--		MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0		0x141
--		/* Disable Pullup for SD_VSEL */
--		MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4		0x41
--	>;
--};
--
--&pinctrl_uart3 {
--	u-boot,dm-spl;
--	u-boot,dm-pre-reloc;
--};
--
--&pinctrl_usdhc1 {
--	u-boot,dm-spl;
--};
--
--&pinctrl_usdhc1_100mhz {
--	u-boot,dm-spl;
--};
--
--&pinctrl_usdhc1_200mhz {
--	u-boot,dm-spl;
--};
--
--&pinctrl_usdhc2 {
--	u-boot,dm-spl;
--};
--
--&pca9450 {
--	u-boot,dm-spl;
--};
--
--&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} {
--	u-boot,dm-spl;
--};
--
--&ecspi1 {
--	u-boot,dm-spl;
--};
--
--&gpio1 {
--	u-boot,dm-spl;
--};
--
--&gpio2 {
--	u-boot,dm-spl;
--};
--
--&gpio3 {
--	u-boot,dm-spl;
--};
--
--&gpio4 {
--	u-boot,dm-spl;
--};
--
--&gpio5 {
--	u-boot,dm-spl;
--};
--
--&uart3 {
--	u-boot,dm-spl;
--	u-boot,dm-pre-reloc;
--};
--
--&usdhc1 {
--	u-boot,dm-spl;
--};
--
--&usdhc2 {
--	u-boot,dm-spl;
--};
--
--&wdog1 {
--	u-boot,dm-spl;
--};
-+#include "imx8mm-kontron-n801x-u-boot.dtsi"
-diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi
-new file mode 100644
-index 0000000000..22d18e6f1c
---- /dev/null
-+++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi
-@@ -0,0 +1,128 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+/*
-+ * Copyright (C) 2019 Kontron Electronics GmbH
-+ */
-+
-+#include "imx8mm-u-boot.dtsi"
-+
-+/ {
-+	aliases {
-+		usb0 = &usbotg1;
-+		usb1 = &usbotg2;
-+	};
-+
-+	wdt-reboot {
-+		compatible = "wdt-reboot";
-+		wdt = <&wdog1>;
-+		u-boot,dm-spl;
-+	};
-+
-+	firmware {
-+		optee {
-+			compatible = "linaro,optee-tz";
-+			method = "smc";
-+		};
-+	};
-+};
-+
-+&fec1 {
-+	phy-mode = "rgmii-rxid";
-+};
-+
-+&i2c1 {
-+	u-boot,dm-spl;
-+	u-boot,dm-pre-reloc;
-+};
-+
-+&i2c2 {
-+	status = "okay";
-+	u-boot,dm-spl;
-+	u-boot,dm-pre-reloc;
-+};
-+
-+&pinctrl_ecspi1 {
-+	u-boot,dm-spl;
-+};
-+
-+&pinctrl_i2c1 {
-+	u-boot,dm-spl;
-+};
-+
-+&pinctrl_pmic {
-+	u-boot,dm-spl;
-+	fsl,pins = <
-+		MX8MM_IOMUXC_GPIO1_IO00_GPIO1_IO0		0x141
-+		/* Disable Pullup for SD_VSEL */
-+		MX8MM_IOMUXC_GPIO1_IO04_GPIO1_IO4		0x41
-+	>;
-+};
-+
-+&pinctrl_uart3 {
-+	u-boot,dm-spl;
-+	u-boot,dm-pre-reloc;
-+};
-+
-+&pinctrl_usdhc1 {
-+	u-boot,dm-spl;
-+};
-+
-+&pinctrl_usdhc1_100mhz {
-+	u-boot,dm-spl;
-+};
-+
-+&pinctrl_usdhc1_200mhz {
-+	u-boot,dm-spl;
-+};
-+
-+&pinctrl_usdhc2 {
-+	u-boot,dm-spl;
-+};
-+
-+&pca9450 {
-+	u-boot,dm-spl;
-+};
-+
-+&{/soc@0/bus@30800000/i2c@30a20000/pmic@25/regulators} {
-+	u-boot,dm-spl;
-+};
-+
-+&ecspi1 {
-+	u-boot,dm-spl;
-+};
-+
-+&gpio1 {
-+	u-boot,dm-spl;
-+};
-+
-+&gpio2 {
-+	u-boot,dm-spl;
-+};
-+
-+&gpio3 {
-+	u-boot,dm-spl;
-+};
-+
-+&gpio4 {
-+	u-boot,dm-spl;
-+};
-+
-+&gpio5 {
-+	u-boot,dm-spl;
-+};
-+
-+&uart3 {
-+	u-boot,dm-spl;
-+	u-boot,dm-pre-reloc;
-+};
-+
-+&usdhc1 {
-+	u-boot,dm-spl;
-+};
-+
-+&usdhc2 {
-+	u-boot,dm-spl;
-+};
-+
-+&wdog1 {
-+	u-boot,dm-spl;
-+};
--- 
-2.30.2
-

board/kontron/bl-imx8mm/post-build.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-BOARD_DIR="$(dirname $0)"
-PARTUUID="$($HOST_DIR/bin/uuidgen)"
-
-install -d "$TARGET_DIR/boot/extlinux/"
-sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/extlinux.conf" > "$TARGET_DIR/boot/extlinux/extlinux.conf"
-sed "s/%PARTUUID%/$PARTUUID/g" "$BOARD_DIR/genimage.cfg" > "$BINARIES_DIR/genimage.cfg"

board/kontron/bl-imx8mm/readme.txt

@@ -1,85 +0,0 @@
-Kontron BL i.MX8M Mini
-======================
-
-https://www.kontron.com/produkte/baseboard-bl-i.mx8m-mini/p158549
-
-
-How to build it
-===============
-
-Configure buildroot:
-
-  $ make kontron_bl_imx8mm_defconfig
-
-Change settings to fit your needs (optional):
-
-  $ make menuconfig
-
-Compile everything and build the rootfs image:
-
-  $ make
-
-
-Result of the build
-===================
-
-After building, the output/images directory contains:
-
-  output/images/
-    ├── bl31.bin
-    ├── boot.scr
-    ├── ddr_fw.bin
-    ├── flash.bin
-    ├── Image
-    ├── imx8mm-kontron-n801x-s.dtb
-    ├── lpddr4_pmu_train_1d_dmem_201904.bin
-    ├── lpddr4_pmu_train_1d_dmem_202006.bin
-    ├── lpddr4_pmu_train_1d_dmem.bin
-    ├── lpddr4_pmu_train_1d_dmem_pad.bin
-    ├── lpddr4_pmu_train_1d_fw.bin
-    ├── lpddr4_pmu_train_1d_imem_201904.bin
-    ├── lpddr4_pmu_train_1d_imem_202006.bin
-    ├── lpddr4_pmu_train_1d_imem.bin
-    ├── lpddr4_pmu_train_1d_imem_pad.bin
-    ├── lpddr4_pmu_train_2d_dmem_201904.bin
-    ├── lpddr4_pmu_train_2d_dmem_202006.bin
-    ├── lpddr4_pmu_train_2d_dmem.bin
-    ├── lpddr4_pmu_train_2d_dmem_pad.bin
-    ├── lpddr4_pmu_train_2d_fw.bin
-    ├── lpddr4_pmu_train_2d_imem_201904.bin
-    ├── lpddr4_pmu_train_2d_imem_202006.bin
-    ├── lpddr4_pmu_train_2d_imem.bin
-    ├── lpddr4_pmu_train_2d_imem_pad.bin
-    ├── lpddr4_pmu_train_fw.bin
-    ├── rootfs.ext2
-    ├── rootfs.ext4 -> rootfs.ext2
-    ├── rootfs.tar
-    ├── sdcard.img
-    ├── u-boot.bin
-    └── u-boot-spl.bin
-
-
-Flashing the SD card image
-==========================
-
-To install the image on a SDCard simply copy sdcard.img to the storage (e.g. SD, eMMC)
-
-  $ sudo dd if=output/images/sdcard.img of=<your-sd-device>
-
-
-Preparing the board
-===================
-
- * Connect a serial line to the board
- * Insert the SD card
- * Power-up the board
-
-
-Booting the board
-=================
-
-By default the bootloader will search for the first valid image, starting
-with the internal eMMC. To make sure the bootloader loads bootscript from
-the correct location (SD card) set the boot_targets environment variable:
-
-  $ setenv boot_targets mmc1

board/kontron/pitx-imx8m/extlinux.conf

@@ -1,4 +0,0 @@
-label buildroot
-  kernel /boot/Image
-  devicetree /boot/freescale/imx8mq-kontron-pitx-imx8m.dtb
-  append root=PARTUUID=%PARTUUID% rootwait rw

board/kontron/pitx-imx8m/genimage.cfg

@@ -1,17 +0,0 @@
-image sdcard.img {
-	hdimage {
-		partition-table-type = "gpt"
-	}
-
-	partition imx-boot {
-		in-partition-table = "no"
-		image = "imx8-boot-sd.bin"
-		offset = 33K
-	}
-
-	partition rootfs {
-		offset = 8M
-		image = "rootfs.ext4"
-		partition-uuid = %PARTUUID%
-	}
-}