Update for 2021.08.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,700 +1,3 @@
-2022.05.3, released October 2nd, 2022
-
-	Important / security related fixes.
-
-	Fixed compatibility issue with make 4.3 and the 'printvars' /
-	'show-vars' commands.
-
-	Dependencies: Ensure 'find' and 'xargs' are available on the
-	build host.
-
-	A large number of typo fixes.
-
-	Defconfigs: Galileo: Fix defconfig syntax, Licheepi zero: Fix
-	U-Boot dependencies, Bananapi m1, Olimx a20 olinuxino lime
-	1+2, a33 olinuxino: Use standard FPU configuration, Pine 64
-	sopine, Rockpro 64: Change to mainline ATF to fix build issue.
-
-	Updated/fixed packages: ace, arm-trusted-firmware,
-	babeltrace2, boost, botan, busybox, clamav, cog, containerd,
-	cups, dhcpcd, directfb, docker-cli, docker-engine, connman,
-	edk2, edk2-platform, elf2flt, expat, ffmpeg, ficl, freeswitch,
-	gcc, gdb, git, glibc, gnutls, go, gocryptfs, graphicsmagick,
-	grub2, gst1-plugins-bad, gst1-plugins-good, heirloom-mailx,
-	icu, igh-ethercat, imagemagick, imx-gpu-viv, jack2, jose,
-	jpeg, jquery-ui-themes, kodi, kvm-unit-tests, libcamera,
-	libconfuse, libfreeimage, libglvnd, libgpg-error, libinput,
-	libmdbx, libp11, libsepol, libtirpc, libupnp, libvirt,
-	libvncserver, libwpe, libxml2, libzlib, linux, linux-tools,
-	lshw, m4, makedevs, mali-driver, mariadb, memcached, mesa3d,
-	minidlna, mosquitto, mutt, mv-ddr-marvell, ncurses, ne10,
-	netsniff-ng, networkd-dispatcher, ocrad, ola, opencv4,
-	openocd, openssh, openvmtools, pango, pcsc-lite, pistache,
-	polkit, postgis, postgresql, python-crossbar,
-	python-paho-mqtt, python-pygame, python-service-identity,
-	python-txdbus, python3, qemu, qlibc,
-	qoriq-cadence-dp-firmware, qt5xmlpatterns, ranger, redis,
-	rng-tools, rsync, rsyslog, rtl8189es, rtl8723bu, runc, rustc,
-	sconeserver, sdl2, snort, sox, sqlite, squid, stress-ng,
-	strongswan, sunxi-mali-utgard-driver, sysdig, syslinux,
-	syslog-ng, tcf-agent, tcpreplay, tesseract-ocr, tinyproxy,
-	uacme, uboot-tools, uclibc, unzip, usbguard, v4l2loopback,
-	vim, waffle, webkitgtk, weston, wolfssl, wpewebkit, xfsprogs,
-	xserver_xorg-server, xtables-addons, zziplib
-
-	Issues resolved:
-
-	#14556: python-crossbar fails to build
-	#14796: 64 bit time and seccomp conflict (OpenSSH server crash)
-	#14951: boost compile error when running make  silently
-
-2022.05.2, released August 31st, 2022
-
-	Important / security related fixes.
-
-	dependencies: Ensure 'cmp' is available on the build host.
-
-	pkg-utils: The KCONFIG_ENABLE_OPT macro used to enforce a specific
-	Kconfig option to be enabled (E.G. for kernel options needed by
-	packages) no longer changes a =m (modular) with =y (built in).
-
-	check-host-rpath: Silence readelf warnings when clang is used
-
-	GCC 10.x updated to 10.4.0
-
-	Defconfigs: Kria kv260: Fix u-boot configuration
-
-	Updated/fixed packages: apg, arm-trusted-firmware, assimp,
-	bayer2rgb-neon, bind, bird, cog, cwiid, diffutils, freerdp,
-	fluidsynth, gcc, gdk-pixbuf, glibc, glslsandbox-player,
-	gnupg2, gtest, i2pd, jack2, jquery-validation, jszip,
-	kvm-unit-tests, libbsd, libcamera, libcurl, libest, libiio,
-	libkrb5, libopenssl, libp11, libpsl, libwebsockets, localedef,
-	luasyslog, lxc, mbedtls, mstpd, mutt, netdata, netsniff-ng,
-	nodejs, nvidia-driver, ola, openssl, opkg-utils, paho-mqtt-c,
-	pango, pcsc-lite, perl, perl-crypt-openssl-rsa, pimd, poppler,
-	postgis, powerpc-utils, pppd, protobuf-c, pulseaudio,
-	python-bottle, python-django, python-lxml, python3, qt5webkit,
-	redis, rpi-userland, rsyslog, runc, rustc, sconeserver,
-	sg3_utils, shadowsocks-libev, stellarium, suricata, swupdate,
-	tcpreplay, uacme, uclibc, v4l2loopback, webkitgtk,
-	wilc-driver, wine, wpewebkit, xdg-dbus-proxy,
-	xserver_xorg-server, zeromq, zfs, zlib-ng
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13796: Problems compiling package gst-plugins-good
-
-2022.05.1, released July 24th, 2022
-
-	Important / security related fixes.
-
-	Disable big endian no-mmu on ARM as it is not supported by
-	elf2flt.
-
-	Tighten dependencies for external Bootlin toolchains to ensure
-	they can only be selected in compatible configurations.
-
-	Support external toolchains without gdbserver.
-
-	Updated/fixed packages: apache, avahi, bdwgc, bind, bpftool,
-	cups, darkhttpd, dmalloc, ecryptfs-utils, fxload, ghostscript,
-	gnutls, gst-omx, gst1-devtools, gst1-libav, gst1-plugins-base,
-	gst1-plugins-bad, gst1-plugins-good, gst1-plugins-ugly,
-	gst1-python, gst1-rtsp-server, gst1-vaapi, gstreamer1,
-	gstreamer1-editing-services, gtest, iptables, keyutils, lcms2,
-	libabseil-cpp, libcamera, libcurl, libeastl, libgpgme,
-	libgtk3, libmdbx, libmediaart, libmodsecurity, libnetconf2,
-	libopenssl, libpjsip, libsamplerate, libsndfile, libtalloc,
-	logrotate, luajit, nginx, noip, paxtest, php, postgresql,
-	procrank_linux, pure-ftpd, python-pillow, qdecoder,
-	rabbitmq-server, rpi-userland, ruby, rustc, sofia-sip,
-	systemd, tcpreplay, tinyproxy, tor, uacme, uboot-tools, vim,
-	watchdogd, webkitgtk, weston, wireguard-linux-compat,
-	wpa_supplicant, wpewebkit, zstd
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14881: Watchdogd Package missing INSTALL_STAGING
-
-2022.05, released June 6th, 2022
-
-	Fixes all over the tree.
-
-	Rework BR2_STATIC_LIBS handling to ensure it can only be
-	enabled if a suitable C library is available.
-
-	Updated/fixed packages: arm-trusted-firmware, at91bootstap,
-	boinc, boost, cpulimit, diffutils, edk2, eigen, fbv, gcr,
-	gensio, glibc, go, gtest, iucode-tool, kvm-unit-tests, libcec,
-	libcurl, libks, linux, linux-tools, lttng-modules, mariadb,
-	memcached, mono, musl, mutt, netdata, network-manager, nginx,
-	ogre, openjpeg, openvpn, pipewire, python-crossbar, qemu,
-	qpid-proton, rauc, rockchip-mali, rsyslog,
-	rtl8812au-aircrack-ng, ruby, runc, rustc, samba4, tiff,
-	uclibc, unrar, vim, webkitgtk, wpewebkit,
-	xdriver_xf86-video-ati, xml-security-c, zchunk, zlib-ng
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14821: Samba server is failing to compile
-	#14826: make qemu_x86_64_defconfig stopped working
-
-2022.05-rc2, released May 30th, 2022
-
-	Fixes all over the tree.
-
-	Defconfigs: qemu_ppc64*: Use binutils 2.36.1 to fix build
-	issue, qemu_arm_vexpress_tz: Fix optee-os build issue,
-	qemu_arm_versatile_nommu: Drop now that nommu for ARMv5 is no
-	longer available
-
-	Updated/fixed packages: dhcp, edk2, gcr, glibc, i2pd, janet,
-	janus-gateway, libfreeimage, libnftnl, libnss, libodb-boost,
-	libostree, libwebsockets, linux-tools, midori, ntfs-3g, ola,
-	optee-client, pcsc-lite, pipewire, python-flask,
-	python-service-identity, python-werkzeug, qemu, rng-tools,
-	rockchip-mali, strace, xdriver_xf86-video-amdgpu
-
-	Removed packages: ktap
-
-2022.05-rc1, released May 18th, 2022
-
-	Fixes all over the tree and new features.
-
-	Toolchain:
-	- glibc update to 2.35, musl updated to 1.2.3
-	- gcc 11.x updated to 11.3, support for external gcc 12.x
-	- binutils 2.38 added, 2.32/2.35.2 removed, default changed to 2.37
-	- s390x Bootlin external toolchain added
-	- 5.17.x kernel headers support added
-
-	Filesystem:
-	- Rework OCI entrypoint/command logic to handle command arguments
-	- Squashfs block size is now configurable
-
-	Graphs: Also generate a build time timeline graph (for top
-	level parallel builds).
-
-	scripts/pkg-stats: Optimize memory consumption for CPE parsing
-
-	Fix compatibility issue with the fakeroot script logic and
-	modern versions of dash.
-
-	Change git:// URLs pointing to Github to https://, now that
-	Github has turned off support for git://
-
-	New defconfigs: Octavo osd32mp1_brk / osd32mp1_red
-
-	New packages: falcosecurity-libs, lzma-alone, octave,
-	python-flit-core, python-orjson, python-pydevmem,
-	qt5webengine-chromium, qt5webengine-chromium-catapult, ragel,
-	tbb, wilc-driver, wtfutil
-
-	Wilc1000-firmware renamed to wilc-firmware
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14596: package dialog is outdated and contains a bug
-	#14651: OpenSSH 8.9p1 compiler error under ARM
-	#14656: Adding dependencies from an external tree does not work
-	#14661: Fakeroot script relies on bash-isms, does not work with..
-	#14681: QT5WEBENGINE not building
-	#14686: genimage.cfg have a hard-coded .ext4 extension which..
-	#14701: Multiple unresolved symbols while building kernel ..
-	#14706: nodjs build problem
-	#14711: nodjs build problem missing bzip
-	#14721: python-argon2_cffi no longer works
-	#14731: BR2_PACKAGE_IOSTAT
-	#14751: LVM2 Outdated Link
-
-2022.02.2, released May 29th, 2022
-
-	Important / security related fixes.
-
-	Archictures: Drop sh2a, correct x86 Bonnell variant
-
-	Toolchain: Bump GCC 11.x to 11.3, correct pre-installed
-	external toolchain logic when toolchain is available in path.
-
-	Rework OCI filesystem entrypoint/command logic to handle
-	command arguments
-
-	Defconfigs: Update Zynqmp zcu102/106 to final 2022.1 release,
-	fix zcu106 PLL config
-
-	Updated/fixed packages: adwaita-icon-theme, afboot-stm32,
-	aircrack-ng, alchemy, alsa-lib, arptables, assimp, asterisk,
-	aubio, avrdude, azure-iot-sdk-c, batman-adv, binutils,
-	bpftool, brotli, cairo, cifs-utils, clamav, cryptodev-linux,
-	dhcp, diffutils, dmalloc, duktape, e2fsprogs, elf2flt, espeak,
-	expat, ffmpeg, fluidsynth, freerdp, gcc, git, glorytun,
-	glslsandbox-player, gnutls, go, gst1-imx, gst1-plugins-good,
-	gzip, imagemagick, janus-gateway, keepalived, kompexsqlite,
-	kvm-unit-tests, libarchive, libcgi, libcurl, libevdev,
-	libeXosip2, libhtp, libinput, libkcapi, libkrb5, libks,
-	libmdbx, libmnl, libnpupnp, libnspr, libopenssl, liboping,
-	libpjsip, libpri, libselinux, libsigsegv, libv4l,
-	libwebsockets, libxml2, linux, linux-tools, ltp-testsuite,
-	luajit, lvm2, mali-driver, mariadb, mc, minizip, mpd, mutt,
-	netatalk, netsurf, network-manager, nodejs, numactl, nut,
-	omniorb, openbox, opencv4, openjdk, openjdk-bin, openocd,
-	pamtester, pango, pcre2, php, php-apcu, pinentry, pixman,
-	polkit, postgis, postgresql, pure-ftpd, python-aenum,
-	python-avro, python-django, python-pillow, python-simplejson,
-	python-urllib3, python-zopfli, python3, qemu, qpdf, quazip,
-	redis, rockchip-mali, rsync, rt-tests, rust, rtl8818eu,
-	rtl8189es, rtl8189fs, rtl_433, sam-ba, samba4, sdl2_ttf,
-	shadowsocks-libev, shim, subversion, sun20i-d1-spl, suricata,
-	systemd, tftpd, trinity, tvheadend, udev, uftrace,
-	urandom-scripts, usb_modeswitch, valgrind, vde2, vim,
-	wireplumber, wolfssl, wpa_supplicant, xlib_libXfont2, xz,
-	zlib, zlog
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#14751: LVM2 Outdated Link
-
-2022.02.1, released April 11th, 2022
-
-	Important / security related fixes.
-
-	Graphs: Also generate a build time timeline graph (for top
-	level parallel builds).
-
-	scripts/pkg-stats: Optimize memory consumption for CPE parsing
-
-	Fix compatibility issue with the fakeroot script logic and
-	modern versions of dash.
-
-	Change git:// URLs pointing to Github to https://, now that
-	Github has turned off support for git://
-
-	Updated/fixed packages: ace, apache, apr, apr-util, belr,
-	bind, bluez5_utils, boinc, bpftool, busybox, cloop, cog,
-	containerd, cppcms, dav1d, dhcp, dieharder, dnsmasq,
-	docker-cli, docker-engine, efl, ell, fakeroot, flac,
-	fluidsynth, gdk-pixbuf, glib-networking, gnutls, 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, haproxy, htop, intel-gmmlib,
-	ipmiutil, iwd, jack1, jack2, lftp, libabseil-cpp, libbluray,
-	libcamera-apps, libcoap, libcurl, libest, libgee, libglib2,
-	libgtk3, libiec61850, libkrb5, libminiupnpc, libodb,
-	libodb-boost, libopenssl, libp11, libpsl, libressl, librstp,
-	librtlsdr, liburing, libyang, libzlib, luasec, lxc, matio,
-	meson, minidlna, minizip, mpd, mtools, netatalk, nbd, odb,
-	openblas, openssh, openvpn, optee-os, opus, paho-mqtt-c,
-	pango, php, pipewire, pkcs11-helper, postgresql, ppp,
-	protozero, python-aioconsole, python-avro, python-brotli,
-	python-greenlet, python-paramiko, python-pillow,
-	python-rpi-gpio, python-treq, python-twisted, python-ujson,
-	python-weasyprint, qt5base, qt5wayland, raptor, rpi-firmware,
-	rpi-userland, rtl_433, runc, rust, rygel, samba4,
-	shairport-sync, spice, spidev_test, stunnel, systemd,
-	timescaledb, trace-cmd, trousers, ts4900-fpga, tvheadend,
-	udpcast, unbound, upower, urandom-scripts, usbguard, valgrind,
-	valijson, vim, wavpack, wget, wireplumber, wireshark, woff2,
-	xmrig, zabbix, zlib-ng, zynaddsubfx, zziplib
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13971: ip6tables-nft build does not include MASQUERADE target..
-	#14651: OpenSSH 8.9p1 compiler error under ARM
-	#14656: Adding dependencies from an external tree does not work
-	#14661: Fakeroot script relies on bash-isms, does not work ..
-	#14686: genimage.cfg have a hard-coded .ext4 extension which..
-	#14701: Multiple unresolved symbols while building kernel ..
-	#14711: nodjs build problem missing bzip
-	#14731: BR2_PACKAGE_IOSTAT
-
-2022.02, released March 8th, 2022
-
-	Various fixes.
-
-	Fixes to cargo and golang packaging infrastructure.
-
-	Defconfigs: OrangePi RK3399: Fix genimage format
-
-	Updated/fixed packages: azure-iot-sdk-c, bpftool, cog,
-	directfb, directfb-examples, dnsmasq, docker-engine, expat,
-	freerdp, frr, gdb, ghostscript, glib-networking, go, haproxy,
-	hostapd, kf5-extra-cmake-modules, kf5-kcoreaddons,
-	kf5-modemmanager-qt, kf5-networkmanager-qt, libcamera-apps,
-	libgee, libglfw, librstp, libtorrent, libvirt, libxslt, linux,
-	mariadb, oprofile, osm2pgsql, pulseview, python-cryptography,
-	python-gnupg, python-treq, qt5base, qt5webkit, rauc, re2,
-	rygel, safeclib, sconeserver, seatd, sord, upmpdcli,
-	util-linux, weston, wpa_supplicant, xdriver_xf86-video-mach64,
-	xdriver_xf86-video-nouveau, xdriver_xf86-video-qxl,
-	xscreensaver, zabbix
-
-	New packages: gdk-pixbuf-xlib
-
-	Removed packages: python-pycli
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar..
-	#14611: 2022.02-rc2: Build of BR2_x86_64 with BR2_LINUX_KERNEL_..
-	#14631: host-go-bootstrap: go not being built for package in ..
-	#14636: azure-iot-sdk-c: Installed headers do not compile
-	#14641: oprofile can not find the events files
-
-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.3, released March 24th, 2022
-
-	Important / security related fixes.
-
-	Updated/fixed packages: apache, azure-iot-sdk-c, boinc, dbus,
-	directfb, docker-engine, exempi, expat, flac, gdb, gdk-pixbuf,
-	gnutls, go, haproxy, libcurl, libiec61850, libminiupnpc,
-	libodb, libodb-boost, libopenssl, libpjsip, libressl, librsvg,
-	libsrtp, libvirt, libxml2, libxslt, lxc, mariadb, minidlna,
-	odb, openblas, openvpn, oprofile, php, pppd, python-ipython,
-	python-twisted, raptor, rpi-firmware, samba4, seatd,
-	timescaledb, usbguard, util-linux, vim, wavpack,
-	wireless-regdb, wireplumber, wireshark, wolfssl, xscreensaver,
-	xterm, zsh
-
-	New packages: gdk-pixbuf-xlib
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar..
-	#14636: azure-iot-sdk-c: Installed headers do not compile
-	#14641: oprofile can not find the events files
-
-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.
@@ -860,62 +163,6 @@
 	#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.
@@ -1114,188 +361,6 @@
 	#13751: libopenssl (static): huge drop in performance in newer ..
 	#13771: package htop has undeclared dependency on host python
 
-2021.02.12, released April 6th, 2022
-
-	Important / security related fixes.
-
-	pkg-stats: Limit memory use for CPE matching
-
-	Updated/fixed packages: gdk-pixbuf, jack2, libzlib, matio,
-	nbd, netatalk, opus, python-paramiko, python-treq,
-	python-twisted, spidev_test, unbound, urandom-scripts, vim,
-	wireshark, zlib-ng, zziplib
-
-2021.02.11, released March 25th, 2022
-
-	Important / security related fixes.
-
-	Updated/fixed packages: apache, azure-iot-sdk-c, dbus,
-	directfb, docker-engine, exempi, expat, flac, gdk-pixbuf,
-	gnutls, go, haproxy, libcurl, libiec61850, libminiupnpc,
-	libodb, libodb-boost, libopenssl, libpjsip, libressl, librsvg,
-	libsrtp, libxml2, libxslt, lxc, mariadb, odbm openblas,
-	openvpn, oprofile, php, pppd, python-ipython, python-treq,
-	python-twisted, python-txbus, python-txtorcon, raptor,
-	rpi-firmware, samba4, timescaledb, util-linux, vim, wavpack,
-	wireless-regdb, wireshark, wolfssl, xscreensaver, xterm, zsh
-
-	New packages: gdk-pixbuf-xlib
-
-	Removed packages: python-coherence
-
-	Issues resolved (http://bugs.uclibc.org):
-
-	#13126: make fails - bzip2-1.0.6.tar.gz and DirectFB-1.7.7.tar..
-	#14636: azure-iot-sdk-c: Installed headers do not compile
-	#14641: oprofile can not find the events files
-
-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.

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"
@@ -601,8 +597,6 @@ choice
 
 config BR2_STATIC_LIBS
 	bool "static only"
-	depends on !BR2_TOOLCHAIN_BUILDROOT || \
-		BR2_TOOLCHAIN_BUILDROOT_STATIC_LIBS_SUPPORTS
 	help
 	  Build and use only static libraries. No shared libraries will
 	  be installed on the target. This potentially increases your

Config.in.legacy

@@ -144,519 +144,7 @@ endif
 
 ###############################################################################
 
-comment "Legacy options removed in 2022.05"
-
-config BR2_PACKAGE_PHP_EXT_WDDX
-	bool "php wddx removed"
-	select BR2_LEGACY
-	help
-	  The WDDX extension was removed from php.
-
-config BR2_PACKAGE_KTAP
-	bool "ktap removed"
-	select BR2_LEGACY
-	help
-	  Package was removed because it is not compatible with latest
-	  kernels and is not maintained anymore (no release since 2013).
-
-config BR2_KERNEL_HEADERS_5_16
-	bool "kernel headers version 5.16.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 5.16.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_KERNEL_HEADERS_4_4
-	bool "kernel headers version 4.4.x are no longer supported"
-	select BR2_LEGACY
-	help
-	  Version 4.4.x of the Linux kernel headers are no longer
-	  maintained upstream and are now removed.
-
-config BR2_BINUTILS_VERSION_2_32_X
-	bool "binutils 2.32.x has been removed"
-	select BR2_LEGACY
-	help
-	  binutils 2.32 has been removed, use a newer version.
-
-config BR2_sh2a
-	bool "sh2a architecture support removed"
-	select BR2_LEGACY
-	help
-	  The SuperH 2A (SH2A) architecture was not maintained, and
-	  broken, so its support was dropped.
-
-config BR2_BINUTILS_VERSION_2_35_X
-	bool "binutils 2.35.x has been removed"
-	select BR2_LEGACY
-	help
-	  binutils 2.35 has been removed, use a newer version.
-
-config BR2_PACKAGE_BOOST_LAYOUT_TAGGED
-	bool "boost tagged layout removed"
-	select BR2_LEGACY
-	help
-	  Boost tagged layout isn't handled by some packages (e.g. botan
-	  or libcpprestsdk).
-
-config BR2_PACKAGE_BOOST_LAYOUT_VERSIONED
-	bool "boost versioned layout removed"
-	select BR2_LEGACY
-	help
-	  Boost versioned layout isn't handled by a number of autotools
-	  and cmake packages (e.g. azmq, cc-tool, i2pd).
-
-comment "Legacy options removed in 2022.02"
-
-config BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS
-	string "entrypoint argumetns has been changed as command"
-	help
-	  The OCI image BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS option
-	  has been renamed to BR2_TARGET_ROOTFS_OCI_CMD to better
-	  reflect its relation to the actual 'command' of the OCI
-	  image.
-
-	  The new semantic for BR2_TARGET_ROOTFS_OCI_CMD is slightly
-	  differnt in relation to how it is interpreted, so be sure to
-	  review the help entry for it.
-
-	  Due to this breaking change, the old value here could not be
-	  set to the new variable.
-
-config BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS_WRAP
-	bool
-	default y if BR2_TARGET_ROOTFS_OCI_ENTRYPOINT_ARGS != ""
-	select BR2_LEGACY
-
-config BR2_PACKAGE_LIBCURL_LIBNSS
-	bool "libcurl NSS removed"
-	select BR2_LEGACY
-	help
-	  NSS was deprecated in libcurl 7.82.0.
-
-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_PYTHON_PYCLI
-	bool "python-pycli removed"
-	select BR2_LEGACY
-	help
-	  Package was removed because it is not compatible with python
-	  3.10 and is not maintained anymore (no release since 2012).
-
-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.
+comment "Legacy options removed in 2021.08"
 
 config BR2_PACKAGE_GNURADIO_PAGER
 	bool "gnuradio gr-flex support removed"
@@ -664,53 +152,6 @@ config BR2_PACKAGE_GNURADIO_PAGER
 	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
@@ -1832,7 +1273,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
@@ -3888,7 +3329,6 @@ config BR2_PACKAGE_ELEMENTARY
 
 config BR2_LINUX_KERNEL_CUSTOM_LOCAL
 	bool "Linux kernel local directory option removed"
-	select BR2_LEGACY
 	help
 	  The option to select a local directory as the source of the
 	  Linux kernel has been removed. It hurts reproducibility of

Makefile

@@ -92,9 +92,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2022.05.3
+export BR2_VERSION := 2021.08.1
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1664710000
+BR2_VERSION_EPOCH = 1633945000
 
 # 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))
@@ -565,12 +574,14 @@ ifeq ($(BR_FORCE_CHECK_DEPENDENCIES),YES)
 
 define CHECK_ONE_DEPENDENCY
 ifeq ($$($(2)_TYPE),target)
+ifeq ($$($(2)_IS_VIRTUAL),)
 ifneq ($$($$($(2)_KCONFIG_VAR)),y)
 $$(error $$($(2)_NAME) is in the dependency chain of $$($(1)_NAME) that \
 has added it to its _DEPENDENCIES variable without selecting it or \
 depending on it from Config.in)
 endif
 endif
+endif
 endef
 
 $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\
@@ -584,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
@@ -871,9 +879,6 @@ graph-build: $(O)/build/build-time.log
 				   --type=pie-$(t) --input=$(<) \
 				   --output=$(GRAPHS_DIR)/build.pie-$(t).$(BR_GRAPH_OUT) \
 				   $(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep))
-	./support/scripts/graph-build-time --type=timeline --input=$(<) \
-		--output=$(GRAPHS_DIR)/build.timeline.$(BR_GRAPH_OUT) \
-		$(if $(BR2_GRAPH_ALT),--alternate-colors)
 
 .PHONY: graph-depends-requirements
 graph-depends-requirements:
@@ -1053,48 +1058,17 @@ endif
 # 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.
-#
-# Note: we iterate of .VARIABLES and filter each variable individually,
-# to workaround a bug in make 4.3; see https://savannah.gnu.org/bugs/?59093
 .PHONY: printvars
 printvars:
-ifndef VARS
-	$(error Please pass a non-empty VARS to 'make printvars')
-endif
 	@:
 	$(foreach V, \
-		$(sort $(foreach X, $(.VARIABLES), $(filter $(VARS),$(X)))), \
+		$(sort $(filter $(VARS),$(.VARIABLES))), \
 		$(if $(filter-out environment% default automatic, \
 				$(origin $V)), \
 		$(if $(QUOTED_VARS),\
 			$(info $V='$(subst ','\'',$(if $(RAW_VARS),$(value $V),$($V)))'), \
 			$(info $V=$(if $(RAW_VARS),$(value $V),$($V))))))
-# ')))) # Syntax colouring...
-
-# See details above, same as for printvars
-.PHONY: show-vars
-show-vars: VARS?=%
-show-vars:
-	@:
-	$(foreach i, \
-		$(call clean-json, { \
-			$(foreach V, \
-				$(.VARIABLES), \
-				$(and $(filter $(VARS),$(V)) \
-					, \
-					$(filter-out environment% default automatic, $(origin $V)) \
-					, \
-					"$V": { \
-						"expanded": $(call mk-json-str,$($V))$(comma) \
-						"raw": $(call mk-json-str,$(value $V)) \
-					}$(comma) \
-				) \
-			) \
-		} ) \
-		, \
-		$(info $(i)) \
-	)
+# ' Syntax colouring...
 
 .PHONY: clean
 clean:
@@ -1188,8 +1162,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'
@@ -1238,7 +1210,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:
@@ -1252,9 +1224,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' \) \
-		-a -not -name '*.orig' -a -not -name '*.rej' \
-		-exec ./utils/check-package --exclude=Sob {} +
+	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

@@ -49,7 +49,7 @@ config BR2_arm
 
 config BR2_armeb
 	bool "ARM (big endian)"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	# MMU support is set by the subarchitecture file, arch/Config.in.arm
 	help
 	  ARM is a 32-bit reduced instruction set computer (RISC)
 	  instruction set architecture (ISA) developed by ARM Holdings.
@@ -60,6 +60,7 @@ config BR2_armeb
 config BR2_aarch64
 	bool "AArch64 (little endian)"
 	select BR2_ARCH_IS_64
+	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
 	  Aarch64 is a 64-bit architecture developed by ARM Holdings.
 	  http://www.arm.com/products/processors/instruction-set-architectures/armv8-architecture.php
@@ -68,6 +69,7 @@ config BR2_aarch64
 config BR2_aarch64_be
 	bool "AArch64 (big endian)"
 	select BR2_ARCH_IS_64
+	select BR2_ARCH_HAS_MMU_MANDATORY
 	help
 	  Aarch64 is a 64-bit architecture developed by ARM Holdings.
 	  http://www.arm.com/products/processors/instruction-set-architectures/armv8-architecture.php
@@ -75,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.
@@ -207,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
@@ -226,7 +230,7 @@ config BR2_s390x
 
 config BR2_sh
 	bool "SuperH"
-	select BR2_ARCH_HAS_MMU_MANDATORY
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	help
 	  SuperH (or SH) is a 32-bit reduced instruction set computer
 	  (RISC) instruction set architecture (ISA) developed by
@@ -326,9 +330,6 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_11
 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

@@ -73,26 +73,21 @@ config BR2_ARM_CPU_HAS_THUMB2
 
 config BR2_ARM_CPU_ARMV4
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
 
 config BR2_ARM_CPU_ARMV5
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
 
 config BR2_ARM_CPU_ARMV6
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
 
 config BR2_ARM_CPU_ARMV7A
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
 
 config BR2_ARM_CPU_ARMV7M
 	bool
 
 config BR2_ARM_CPU_ARMV8A
 	bool
-	select BR2_ARCH_HAS_MMU_MANDATORY
 
 choice
 	prompt "Target Architecture Variant"
@@ -108,19 +103,23 @@ config BR2_arm920t
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV4
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_arm922t
 	bool "arm922t"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV4
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_fa526
 	bool "fa526/626"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_ARMV4
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_strongarm
 	bool "strongarm sa110/sa1100"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_ARMV4
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 comment "armv5 cores"
 config BR2_arm926t
@@ -129,15 +128,18 @@ config BR2_arm926t
 	select BR2_ARM_CPU_MAYBE_HAS_VFPV2
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV5
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_iwmmxt
 	bool "iwmmxt"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_ARMV5
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_xscale
 	bool "xscale"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV5
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 comment "armv6 cores"
 config BR2_arm1136j_s
@@ -145,29 +147,34 @@ config BR2_arm1136j_s
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_arm1136jf_s
 	bool "arm1136jf-s"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_VFPV2
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_arm1176jz_s
 	bool "arm1176jz-s"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_arm1176jzf_s
 	bool "arm1176jzf-s"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_VFPV2
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_arm11mpcore
 	bool "mpcore"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_MAYBE_HAS_VFPV2
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 
 comment "armv7a cores"
 config BR2_cortex_a5
@@ -177,6 +184,7 @@ config BR2_cortex_a5
 	select BR2_ARM_CPU_MAYBE_HAS_VFPV4
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_cortex_a7
 	bool "cortex-A7"
 	select BR2_ARM_CPU_HAS_ARM
@@ -184,6 +192,7 @@ config BR2_cortex_a7
 	select BR2_ARM_CPU_HAS_VFPV4
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_cortex_a8
 	bool "cortex-A8"
 	select BR2_ARM_CPU_HAS_ARM
@@ -191,6 +200,7 @@ config BR2_cortex_a8
 	select BR2_ARM_CPU_HAS_VFPV3
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_cortex_a9
 	bool "cortex-A9"
 	select BR2_ARM_CPU_HAS_ARM
@@ -198,6 +208,7 @@ config BR2_cortex_a9
 	select BR2_ARM_CPU_MAYBE_HAS_VFPV3
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_cortex_a12
 	bool "cortex-A12"
 	select BR2_ARM_CPU_HAS_ARM
@@ -205,6 +216,7 @@ config BR2_cortex_a12
 	select BR2_ARM_CPU_HAS_VFPV4
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_cortex_a15
 	bool "cortex-A15"
 	select BR2_ARM_CPU_HAS_ARM
@@ -212,6 +224,7 @@ config BR2_cortex_a15
 	select BR2_ARM_CPU_HAS_VFPV4
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_cortex_a15_a7
 	bool "cortex-A15/A7 big.LITTLE"
 	select BR2_ARM_CPU_HAS_ARM
@@ -219,6 +232,7 @@ config BR2_cortex_a15_a7
 	select BR2_ARM_CPU_HAS_VFPV4
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
 config BR2_cortex_a17
 	bool "cortex-A17"
@@ -227,6 +241,7 @@ config BR2_cortex_a17
 	select BR2_ARM_CPU_HAS_VFPV4
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_cortex_a17_a7
 	bool "cortex-A17/A7 big.LITTLE"
@@ -235,15 +250,15 @@ config BR2_cortex_a17_a7
 	select BR2_ARM_CPU_HAS_VFPV4
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_pj4
 	bool "pj4"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_VFPV3
 	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 
-# Cortex-M cores are only supported for little endian configurations
-if BR2_arm
 comment "armv7m cores"
 config BR2_cortex_m3
 	bool "cortex-M3"
@@ -260,7 +275,6 @@ config BR2_cortex_m7
 	select BR2_ARM_CPU_MAYBE_HAS_FPV5
 	select BR2_ARM_CPU_ARMV7M
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
-endif # BR2_arm
 endif # !BR2_ARCH_IS_64
 
 comment "armv8 cores"
@@ -272,6 +286,7 @@ config BR2_cortex_a32
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_cortex_a35
 	bool "cortex-A35"
@@ -280,6 +295,7 @@ config BR2_cortex_a35
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_cortex_a53
 	bool "cortex-A53"
@@ -288,6 +304,7 @@ config BR2_cortex_a53
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_cortex_a57
 	bool "cortex-A57"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
@@ -295,6 +312,7 @@ config BR2_cortex_a57
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_cortex_a57_a53
 	bool "cortex-A57/A53 big.LITTLE"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
@@ -302,6 +320,7 @@ config BR2_cortex_a57_a53
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_cortex_a72
 	bool "cortex-A72"
@@ -310,6 +329,7 @@ config BR2_cortex_a72
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_cortex_a72_a53
 	bool "cortex-A72/A53 big.LITTLE"
@@ -318,6 +338,7 @@ config BR2_cortex_a72_a53
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_cortex_a73
 	bool "cortex-A73"
@@ -326,6 +347,7 @@ config BR2_cortex_a73
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_cortex_a73_a35
 	bool "cortex-A73/A35 big.LITTLE"
@@ -334,6 +356,7 @@ config BR2_cortex_a73_a35
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_cortex_a73_a53
 	bool "cortex-A73/A53 big.LITTLE"
@@ -342,12 +365,14 @@ config BR2_cortex_a73_a53
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_emag
 	bool "emag"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 config BR2_exynos_m1
 	bool "exynos-m1"
@@ -356,54 +381,63 @@ config BR2_exynos_m1
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_falkor
 	bool "falkor"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_phecda
 	bool "phecda"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 config BR2_qdf24xx
 	bool "qdf24xx"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_thunderx
 	bool "thunderx (aka octeontx)"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_thunderxt81
 	bool "thunderxt81 (aka octeontx81)"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_thunderxt83
 	bool "thunderxt83 (aka octeontx83)"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_thunderxt88
 	bool "thunderxt88"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_thunderxt88p1
 	bool "thunderxt88p1"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_xgene1
 	bool "xgene1"
@@ -412,6 +446,7 @@ config BR2_xgene1
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 
 comment "armv8.1a cores"
@@ -420,18 +455,21 @@ config BR2_thunderx2t99
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_thunderx2t99p1
 	bool "thunderx2t99p1"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 config BR2_vulcan
 	bool "vulcan"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 
 comment "armv8.2a cores"
@@ -440,18 +478,21 @@ config BR2_cortex_a55
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
 config BR2_cortex_a75
 	bool "cortex-A75"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
 config BR2_cortex_a75_a55
 	bool "cortex-A75/A55 big.LITTLE"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
 config BR2_cortex_a76
 	bool "cortex-A76"
@@ -460,6 +501,7 @@ config BR2_cortex_a76
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 config BR2_cortex_a76_a55
 	bool "cortex-A76/A55 big.LITTLE"
@@ -468,6 +510,7 @@ config BR2_cortex_a76_a55
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 config BR2_neoverse_n1
 	bool "neoverse-N1 (aka ares)"
@@ -476,12 +519,14 @@ config BR2_neoverse_n1
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 config BR2_tsv110
 	bool "tsv110"
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_9
 
 comment "armv8.4a cores"
@@ -490,6 +535,7 @@ config BR2_saphira
 	depends on BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
 	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 	select BR2_ARCH_NEEDS_GCC_AT_LEAST_8
 endchoice
 
@@ -776,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

@@ -1,9 +1,6 @@
 config BR2_POWERPC_CPU_HAS_ALTIVEC
 	bool
 
-config BR2_POWERPC_CPU_HAS_VSX
-	bool
-
 config BR2_POWERPC_CPU_HAS_SPE
 	bool
 
@@ -14,8 +11,6 @@ choice
 	  Specific CPU variant to use
 config BR2_generic_powerpc
 	bool "generic"
-	# No C library supports this variant on ppc64le
-	depends on !BR2_powerpc64le
 config BR2_powerpc_401
 	bool "401"
 	depends on !BR2_ARCH_IS_64
@@ -66,12 +61,8 @@ config BR2_powerpc_604e
 	depends on !BR2_ARCH_IS_64
 config BR2_powerpc_620
 	bool "620"
-	# No C library supports this variant on ppc64le
-	depends on !BR2_powerpc64le
 config BR2_powerpc_630
 	bool "630"
-	# No C library supports this variant on ppc64le
-	depends on !BR2_powerpc64le
 config BR2_powerpc_740
 	bool "740"
 	depends on !BR2_ARCH_IS_64
@@ -124,23 +115,17 @@ config BR2_powerpc_e6500
 	select BR2_POWERPC_CPU_HAS_ALTIVEC
 config BR2_powerpc_power4
 	bool "power4"
-	# No C library supports this variant on ppc64le
-	depends on !BR2_powerpc64le
 config BR2_powerpc_power5
 	bool "power5"
-	# No C library supports this variant on ppc64le
-	depends on !BR2_powerpc64le
 config BR2_powerpc_power6
 	bool "power6"
 	select BR2_POWERPC_CPU_HAS_ALTIVEC
 config BR2_powerpc_power7
 	bool "power7"
 	select BR2_POWERPC_CPU_HAS_ALTIVEC
-	select BR2_POWERPC_CPU_HAS_VSX
 config BR2_powerpc_power8
 	bool "power8"
 	select BR2_POWERPC_CPU_HAS_ALTIVEC
-	select BR2_POWERPC_CPU_HAS_VSX
 endchoice
 
 choice
@@ -172,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
 
@@ -108,7 +106,6 @@ config BR2_RISCV_ABI_LP64
 config BR2_RISCV_ABI_LP64F
 	bool "lp64f"
 	depends on BR2_ARCH_IS_64 && BR2_RISCV_ISA_RVF
-	depends on BR2_USE_MMU
 
 config BR2_RISCV_ABI_LP64D
 	bool "lp64d"
@@ -119,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

@@ -5,6 +5,8 @@ choice
 	help
 	  Specific CPU variant to use
 
+config BR2_sh2a
+	bool "sh2a (SH2A big endian)"
 config BR2_sh4
 	bool "sh4 (SH4 little endian)"
 config BR2_sh4eb
@@ -16,17 +18,15 @@ config BR2_sh4aeb
 endchoice
 
 config BR2_ARCH
+	default "sh2a"		if BR2_sh2a
 	default "sh4"		if BR2_sh4
 	default "sh4eb"		if BR2_sh4eb
 	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_sh4eb || BR2_sh4aeb
+	default "BIG"		if BR2_sh2a || BR2_sh4eb || BR2_sh4aeb
 
 config BR2_READELF_ARCH_NAME
 	default "Renesas / SuperH SH"

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
-	  "bonnell" is preferred. Use BR2_x86_bonnell instead.
-config BR2_x86_bonnell
-	bool "bonnell"
-	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 "bonnell"	if BR2_x86_bonnell
 	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"
 

arch/arch.mk.xtensa

@@ -1,9 +1,3 @@
-BR_ARCH_XTENSA_OVERLAY_FILE = $(call qstrip,$(BR2_XTENSA_OVERLAY_FILE))
-
-ifeq ($(BR_BUILDING)$(BR2_XTENSA_CUSTOM):$(BR_ARCH_XTENSA_OVERLAY_FILE),yy:)
-$(error No xtensa overlay file provided. Check your BR2_XTENSA_OVERLAY_FILE setting)
-endif
-
 ################################################################################
 # This variable can be used by packages that need to extract the overlay.
 #
@@ -15,6 +9,7 @@ endif
 #       tar xf $(ARCH_XTENSA_OVERLAY_FILE) -C $(@D) --strip-components=1 gcc
 #   endif
 ################################################################################
+BR_ARCH_XTENSA_OVERLAY_FILE = $(call qstrip,$(BR2_XTENSA_OVERLAY_FILE))
 ifneq ($(filter http://% https://% ftp://% scp://%,$(BR_ARCH_XTENSA_OVERLAY_FILE)),)
 ARCH_XTENSA_OVERLAY_URL = $(BR_ARCH_XTENSA_OVERLAY_FILE)
 ARCH_XTENSA_OVERLAY_FILE = $($(PKG)_DL_DIR)/$(notdir $(BR_ARCH_XTENSA_OVERLAY_FILE))

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

@@ -14,7 +14,6 @@ image boot.vfat {
 			image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.10.3.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"
-		}
+		} 
 	}
-
 	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/ae300/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/andes/ae350/ae350.dts

@@ -1,274 +0,0 @@
-/dts-v1/;
-
-/ {
-	#address-cells = <2>;
-	#size-cells = <2>;
-	compatible = "andestech,ae350";
-	model = "andestech,ax45";
-	aliases {
-		uart0 = &serial0;
-		spi0 = &spi;
-	};
-
-	chosen {
-		bootargs = "console=ttyS0,38400n8 earlycon=sbi debug loglevel=7";
-		stdout-path = "uart0:38400n8";
-	};
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		timebase-frequency = <60000000>;
-		CPU0: cpu@0 {
-			device_type = "cpu";
-			reg = <0>;
-			status = "okay";
-			compatible = "riscv";
-			riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0";
-			riscv,priv-major = <1>;
-			riscv,priv-minor = <10>;
-			mmu-type = "riscv,sv48";
-			clock-frequency = <60000000>;
-			i-cache-size = <0x8000>;
-			i-cache-sets = <256>;
-			i-cache-block-size = <64>;
-			i-cache-line-size = <64>;
-			d-cache-size = <0x8000>;
-			d-cache-sets = <128>;
-			d-cache-block-size = <64>;
-			d-cache-line-size = <64>;
-			next-level-cache = <&L2>;
-			CPU0_intc: interrupt-controller {
-				#interrupt-cells = <1>;
-				interrupt-controller;
-				compatible = "riscv,cpu-intc";
-			};
-		};
-		CPU1: cpu@1 {
-			device_type = "cpu";
-			reg = <1>;
-			status = "okay";
-			compatible = "riscv";
-			riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0";
-			riscv,priv-major = <1>;
-			riscv,priv-minor = <10>;
-			mmu-type = "riscv,sv48";
-			clock-frequency = <60000000>;
-			i-cache-size = <0x8000>;
-			i-cache-sets = <256>;
-			i-cache-block-size = <64>;
-			i-cache-line-size = <64>;
-			d-cache-size = <0x8000>;
-			d-cache-sets = <128>;
-			d-cache-block-size = <64>;
-			d-cache-line-size = <64>;
-			next-level-cache = <&L2>;
-			CPU1_intc: interrupt-controller {
-				#interrupt-cells = <1>;
-				interrupt-controller;
-				compatible = "riscv,cpu-intc";
-			};
-		};
-		CPU2: cpu@2 {
-			device_type = "cpu";
-			reg = <2>;
-			status = "okay";
-			compatible = "riscv";
-			riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0";
-			riscv,priv-major = <1>;
-			riscv,priv-minor = <10>;
-			mmu-type = "riscv,sv48";
-			clock-frequency = <60000000>;
-			i-cache-size = <0x8000>;
-			i-cache-sets = <256>;
-			i-cache-block-size = <64>;
-			i-cache-line-size = <64>;
-			d-cache-size = <0x8000>;
-			d-cache-sets = <128>;
-			d-cache-block-size = <64>;
-			d-cache-line-size = <64>;
-			next-level-cache = <&L2>;
-			CPU2_intc: interrupt-controller {
-				#interrupt-cells = <1>;
-				interrupt-controller;
-				compatible = "riscv,cpu-intc";
-			};
-		};
-		CPU3: cpu@3 {
-			device_type = "cpu";
-			reg = <3>;
-			status = "okay";
-			compatible = "riscv";
-			riscv,isa = "rv64i2p0m2p0a2p0f2p0d2p0c2p0xv5-1p1xdsp0p0";
-			riscv,priv-major = <1>;
-			riscv,priv-minor = <10>;
-			mmu-type = "riscv,sv48";
-			clock-frequency = <60000000>;
-			i-cache-size = <0x8000>;
-			i-cache-sets = <256>;
-			i-cache-block-size = <64>;
-			i-cache-line-size = <64>;
-			d-cache-size = <0x8000>;
-			d-cache-sets = <128>;
-			d-cache-block-size = <64>;
-			d-cache-line-size = <64>;
-			next-level-cache = <&L2>;
-			CPU3_intc: interrupt-controller {
-				#interrupt-cells = <1>;
-				interrupt-controller;
-				compatible = "riscv,cpu-intc";
-			};
-		};
-	};
-	L2: l2-cache@e0500000 {
-		compatible = "cache";
-		cache-level = <2>;
-		cache-size = <0x80000>;
-		reg = <0x00000000 0xe0500000 0x00000000 0x00001000>;
-		andes,inst-prefetch = <3>;
-		andes,data-prefetch = <3>;
-		// The value format is <XRAMOCTL XRAMICTL>
-		andes,tag-ram-ctl = <0 0>;
-		andes,data-ram-ctl = <0 0>;
-	};
-	memory@0 {
-		reg = <0x00000000 0x00000000 0x00000000 0x80000000>;
-		device_type = "memory";
-	};
-	soc {
-		#address-cells = <2>;
-		#size-cells = <2>;
-		compatible = "andestech,riscv-ae350-soc", "simple-bus";
-		ranges;
-		plic0: interrupt-controller@e4000000 {
-			compatible = "riscv,plic0";
-			reg = <0x00000000 0xe4000000 0x00000000 0x02000000>;
-			interrupts-extended = < &CPU0_intc 11 &CPU0_intc 9 &CPU1_intc 11 &CPU1_intc 9 &CPU2_intc 11 &CPU2_intc 9 &CPU3_intc 11 &CPU3_intc 9>;
-			interrupt-controller;
-			#address-cells = <2>;
-			#interrupt-cells = <2>;
-			riscv,ndev = <71>;
-		};
-		plic1: interrupt-controller@e6400000 {
-			compatible = "riscv,plic1";
-			reg = <0x00000000 0xe6400000 0x00000000 0x00400000>;
-			interrupts-extended = < &CPU0_intc 3 &CPU1_intc 3 &CPU2_intc 3 &CPU3_intc 3>;
-			interrupt-controller;
-			#address-cells = <2>;
-			#interrupt-cells = <2>;
-			riscv,ndev = <4>;
-		};
-		plmt0: plmt0@e6000000 {
-			compatible = "riscv,plmt0";
-			reg = <0x00000000 0xe6000000 0x00000000 0x00100000>;
-			interrupts-extended = < &CPU0_intc 7 &CPU1_intc 7 &CPU2_intc 7 &CPU3_intc 7>;
-		};
-		spiclk: virt_100mhz {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <100000000>;
-		};
-		timer0: timer@f0400000 {
-			compatible = "andestech,atcpit100";
-			reg = <0x00000000 0xf0400000 0x00000000 0x00001000>;
-			interrupts = <3 4>;
-			interrupt-parent = <&plic0>;
-			clock-frequency = <60000000>;
-		};
-		pwm: pwm@f0400000 {
-			compatible = "andestech,atcpit100-pwm";
-			reg = <0x00000000 0xf0400000 0x00000000 0x00001000>;
-			interrupts = <3 4>;
-			interrupt-parent = <&plic0>;
-			clock-frequency = <60000000>;
-			pwm-cells = <2>;
-		};
-		wdt: wdt@f0500000 {
-			compatible = "andestech,atcwdt200";
-			reg = <0x00000000 0xf0500000 0x00000000 0x00001000>;
-			interrupts = <3 4>;
-			interrupt-parent = <&plic0>;
-			clock-frequency = <15000000>;
-		};
-		serial0: serial@f0300000 {
-			compatible = "andestech,uart16550", "ns16550a";
-			reg = <0x00000000 0xf0300000 0x00000000 0x00001000>;
-			interrupts = <9 4>;
-			interrupt-parent = <&plic0>;
-			clock-frequency = <19660800>;
-			reg-shift = <2>;
-			reg-offset = <32>;
-			no-loopback-test = <1>;
-		};
-		rtc0: rtc@f0600000 {
-			compatible = "andestech,atcrtc100";
-			reg = <0x00000000 0xf0600000 0x00000000 0x00001000>;
-			interrupts = <1 4 2 4>;
-			interrupt-parent = <&plic0>;
-			wakeup-source;
-		};
-		gpio: gpio@f0700000 {
-			compatible = "andestech,atcgpio100";
-			reg = <0x00000000 0xf0700000 0x00000000 0x00001000>;
-			interrupts = <7 4>;
-			interrupt-parent = <&plic0>;
-			wakeup-source;
-		};
-		mac0: mac@e0100000 {
-			compatible = "andestech,atmac100";
-			reg = <0x00000000 0xe0100000 0x00000000 0x00001000>;
-			interrupts = <19 4>;
-			interrupt-parent = <&plic0>;
-			dma-coherent;
-		};
-		smu: smu@f0100000 {
-			compatible = "andestech,atcsmu";
-			reg = <0x00000000 0xf0100000 0x00000000 0x00001000>;
-		};
-		mmc0: mmc@f0e00000 {
-			compatible = "andestech,atfsdc010";
-			reg = <0x00000000 0xf0e00000 0x00000000 0x00001000>;
-			interrupts = <18 4>;
-			interrupt-parent = <&plic0>;
-			clock-freq-min-max = <400000 100000000>;
-			max-frequency = <100000000>;
-			fifo-depth = <16>;
-			cap-sd-highspeed;
-			dma-coherent;
-		};
-		dma0: dma@f0c00000 {
-			compatible = "andestech,atcdmac300";
-			reg = <0x00000000 0xf0c00000 0x00000000 0x00001000>;
-			interrupts = <10 4 64 4 65 4 66 4 67 4 68 4 69 4 70 4 71 4>;
-			interrupt-parent = <&plic0>;
-			dma-channels = <8>;
-		};
-		lcd0: lcd@e0200000 {
-			compatible = "andestech,atflcdc100";
-			reg = <0x00000000 0xe0200000 0x00000000 0x00001000>;
-			interrupts = <20 4>;
-			interrupt-parent = <&plic0>;
-			dma-coherent;
-		};
-		pmu: pmu {
-			compatible = "riscv,andes-pmu";
-			device_type = "pmu";
-		};
-		spi: spi@f0b00000 {
-			compatible = "andestech,atcspi200";
-			reg = <0x00000000 0xf0b00000 0x00000000 0x00001000>;
-			interrupts = <4 4>;
-			interrupt-parent = <&plic0>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			num-cs = <1>;
-			clocks = <&spiclk>;
-			flash@0 {
-				compatible = "jedec,spi-nor";
-				reg = <0x00000000>;
-				spi-max-frequency = <50000000>;
-				spi-cpol;
-				spi-cpha;
-			};
-		};
-	};
-};

board/andes/ae350/genimage_sdcard.cfg

@@ -1,26 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"u-boot-spl.bin",
-			"u-boot.itb",
-			"ae350.dtb",
-		}
-	}
-	size = 2M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition boot {
-		partition-type = 0xC
-		image = "boot.vfat"
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		bootable = true
-		image = "rootfs.ext4"
-	}
-}

board/andes/ae350/patches/opensbi/0001-Disable-PIC-explicitly-for-assembling.patch

@@ -1,29 +0,0 @@
-From 3ccb71eeca42dbcd5e4d00ae1877a489ae82598d Mon Sep 17 00:00:00 2001
-From: Yu Chien Peter Lin <peterlin@andestech.com>
-Date: Wed, 29 Dec 2021 16:04:54 +0800
-Subject: [PATCH] Disable PIC explicitly for assembling
-
-This patch is necessary if the fw_dynamic load address
-is not equal to link address.
-However, they are equal currently, since we include an u-boot
-patch for preventing fw_dynamic relocation.
-
-Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
----
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index d6f097d..441518d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -225,6 +225,7 @@ ASFLAGS		+=	-mcmodel=$(PLATFORM_RISCV_CODE_MODEL)
- ASFLAGS		+=	$(GENFLAGS)
- ASFLAGS		+=	$(platform-asflags-y)
- ASFLAGS		+=	$(firmware-asflags-y)
-+ASFLAGS		+=	-fno-pic
-
- ARFLAGS		=	rcs
-
---
-2.25.1

board/andes/ae350/patches/opensbi/0002-Enable-cache-for-opensbi-jump-mode.patch

@@ -1,25 +0,0 @@
-From 325328f4204b40b1fcc8db3b46c7c8805710d21c Mon Sep 17 00:00:00 2001
-From: Yu Chien Peter Lin <peterlin@andestech.com>
-Date: Thu, 30 Dec 2021 08:47:34 +0800
-Subject: [PATCH] Enable cache for opensbi jump mode
-
-Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
----
- firmware/fw_base.S | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/firmware/fw_base.S b/firmware/fw_base.S
-index ab33e11..155d230 100644
---- a/firmware/fw_base.S
-+++ b/firmware/fw_base.S
-@@ -46,6 +46,8 @@
-	.globl _start
-	.globl _start_warm
- _start:
-+	li t0, 0x80003
-+	csrw  0x7ca, t0
-	/* Find preferred boot HART id */
-	MOV_3R	s0, a0, s1, a1, s2, a2
-	call	fw_boot_hart
---
-2.25.1

board/andes/ae350/patches/uboot/0001-Fix-mmc-no-partition-table-error.patch

@@ -1,27 +0,0 @@
-From ea4675215b53d16a72d29b8a6fc6a86cccf59cf0 Mon Sep 17 00:00:00 2001
-From: Yu Chien Peter Lin <peterlin@andestech.com>
-Date: Wed, 5 Jan 2022 11:00:59 +0800
-Subject: [PATCH] Fix mmc no partition table error
-
-Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
----
- drivers/mmc/ftsdc010_mci.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/drivers/mmc/ftsdc010_mci.c b/drivers/mmc/ftsdc010_mci.c
-index 570d54cf..3b1e0aa0 100644
---- a/drivers/mmc/ftsdc010_mci.c
-+++ b/drivers/mmc/ftsdc010_mci.c
-@@ -438,10 +438,6 @@ static int ftsdc010_mmc_probe(struct udevice *dev)
-		return ret;
- #endif
-
--	if (dev_read_bool(dev, "cap-mmc-highspeed") || \
--		  dev_read_bool(dev, "cap-sd-highspeed"))
--		chip->caps |= MMC_MODE_HS | MMC_MODE_HS_52MHz;
--
-	ftsdc_setup_cfg(&plat->cfg, dev->name, chip->buswidth, chip->caps,
-			priv->minmax[1] , priv->minmax[0]);
-	chip->mmc = &plat->mmc;
---
-2.25.1

board/andes/ae350/patches/uboot/0002-Prevent-fw_dynamic-from-relocation.patch

@@ -1,27 +0,0 @@
-From 4c0c5378d032f2f95577585935624baf7b4decf3 Mon Sep 17 00:00:00 2001
-From: Yu Chien Peter Lin <peterlin@andestech.com>
-Date: Wed, 5 Jan 2022 11:02:26 +0800
-Subject: [PATCH] Prevent fw_dynamic from relocation
-
-This patch prevents OpenSBI relocation, load fw_dynamic to link address
-
-Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
----
- board/AndesTech/ax25-ae350/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/board/AndesTech/ax25-ae350/Kconfig b/board/AndesTech/ax25-ae350/Kconfig
-index e50f505a..385c4c11 100644
---- a/board/AndesTech/ax25-ae350/Kconfig
-+++ b/board/AndesTech/ax25-ae350/Kconfig
-@@ -25,7 +25,7 @@ config SPL_TEXT_BASE
-	default 0x800000
-
- config SPL_OPENSBI_LOAD_ADDR
--	default 0x01000000
-+	default 0x0
-
- config BOARD_SPECIFIC_OPTIONS # dummy
-	def_bool y
---
-2.25.1

board/andes/ae350/patches/uboot/0003-Fix-u-boot-proper-booting-issue.patch

@@ -1,26 +0,0 @@
-From 3d09501175ae6f5e3f6520b48b1358226a99ff16 Mon Sep 17 00:00:00 2001
-From: Yu Chien Peter Lin <peterlin@andestech.com>
-Date: Wed, 5 Jan 2022 18:17:39 +0800
-Subject: [PATCH] Fix u-boot proper booting issue
-
-Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
----
- arch/riscv/cpu/start.S | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S
-index 76850ec9..2ccda4f5 100644
---- a/arch/riscv/cpu/start.S
-+++ b/arch/riscv/cpu/start.S
-@@ -139,7 +139,9 @@ call_harts_early_init:
-	 * accesses gd).
-	 */
-	mv	gp, s0
-+#if !CONFIG_IS_ENABLED(RISCV_SMODE)
-	bnez	tp, secondary_hart_loop
-+#endif
- #endif
-
-	jal	board_init_f_init_reserve
---
-2.25.1

board/andes/ae350/patches/uboot/0004-Enable-printing-OpenSBI-boot-logo.patch

@@ -1,25 +0,0 @@
-From 3847a959ac4c07facbd80104ca5fa6a91fad5f35 Mon Sep 17 00:00:00 2001
-From: Yu Chien Peter Lin <peterlin@andestech.com>
-Date: Thu, 6 Jan 2022 13:50:07 +0800
-Subject: [PATCH] Enable printing OpenSBI boot logo
-
-Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
----
- include/opensbi.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/opensbi.h b/include/opensbi.h
-index d812cc8c..91fb8fd9 100644
---- a/include/opensbi.h
-+++ b/include/opensbi.h
-@@ -20,7 +20,7 @@
-
- enum sbi_scratch_options {
-	/** Disable prints during boot */
--	SBI_SCRATCH_NO_BOOT_PRINTS = (1 << 0),
-+	SBI_SCRATCH_NO_BOOT_PRINTS = 0,
- };
-
- /** Representation dynamic info passed by previous booting stage */
---
-2.25.1

board/andes/ae350/post-build.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-cp $BINARIES_DIR/Image $TARGET_DIR/boot
-cp $BINARIES_DIR/ae350.dtb $TARGET_DIR/boot

board/andes/ae350/readme.txt

@@ -1,65 +0,0 @@
-Intro
-=====
-
-Andestech AE350 Platform
-
-The AE350 prototype demonstrates the AE350 platform on the FPGA.
-
-How to build it
-===============
-
-Configure Buildroot
--------------------
-
-  $ make andes_ae350_45_defconfig
-
-If you want to customize your configuration:
-
-  $ make menuconfig
-
-Build everything
-----------------
-Note: you will need to access to the network, since Buildroot will
-download the packages' sources.
-
-  $ make
-
-Result of the build
--------------------
-
-After building, you should obtain the following files:
-
-  output/images/
-  |-- ae350.dtb
-  |-- boot.vfat
-  |-- fw_dynamic.bin
-  |-- fw_dynamic.elf
-  |-- fw_jump.bin
-  |-- fw_jump.elf
-  |-- Image
-  |-- rootfs.ext2
-  |-- rootfs.ext4 -> rootfs.ext2
-  |-- sdcard.img
-  |-- u-boot-spl.bin
-  `-- u-boot.itb
-
-Copy the sdcard.img to a SD card with "dd":
-
-  $ sudo dd if=sdcard.img of=/dev/sdX bs=4096
-  $ sudo sync
-
-Your SD card partition should be:
-
-  Disk /dev/sdb: 14.48 GiB, 15552479232 bytes, 30375936 sectors
-  Disk model: Multi-Card
-  Units: sectors of 1 * 512 = 512 bytes
-  Sector size (logical/physical): 512 bytes / 512 bytes
-  I/O size (minimum/optimal): 512 bytes / 512 bytes
-  Disklabel type: dos
-  Disk identifier: 0x00000000
-
-  Device     Boot Start    End Sectors Size Id Type
-  /dev/sdb1           1   4096    4096   2M  c W95 FAT32 (LBA)
-  /dev/sdb2  *     4097 126976  122880  60M 83 Linux
-
-Insert SD card and reset the board, it should boot Linux from mmc.

board/andes/ae350/rootfs_overlay/boot/extlinux/extlinux.conf

@@ -1,4 +0,0 @@
-label linux
-   kernel /boot/Image
-   fdt /boot/ae350.dtb
-   append earlycon=sbi root=/dev/mmcblk0p2 rootwait

board/andes/ae350/uboot.config.fragment

@@ -1,5 +0,0 @@
-CONFIG_SPL_FS_FAT=y
-CONFIG_SPL_MMC=y
-# CONFIG_SPL_RAM_SUPPORT is not set
-# CONFIG_OF_BOARD is not set
-CONFIG_OF_SEPARATE=y

board/andes/readme.txt

@@ -1,10 +1,10 @@
 Intro
 =====
 
-Andestech(nds32) AE300 Platform
+Andestech(nds32) AE3XX Platform
 
-The AE300 prototype demonstrates the AE300 example platform on the FPGA.
-It is composed of one Andestech(nds32) processor and AE300.
+The AE3XX prototype demonstrates the AE3XX example platform on the FPGA. 
+It is composed of one Andestech(nds32) processor and AE3XX.
 
 How to build it
 ===============
@@ -12,10 +12,10 @@ How to build it
 Configure Buildroot
 -------------------
 
-The andes_ae300_defconfig configuration is a sample configuration with
+The andes_ae3xx_defconfig configuration is a sample configuration with
 all that is required to bring the FPGA Development Board:
 
-  $ make andes_ae300_defconfig
+  $ make andes_ae3xx_defconfig
 
 Build everything
 ----------------

board/arcturus/aarch64-ucls1012a/post-build.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
 
 mkdir -p ${TARGET_DIR}/lib/firmware
+cp -f ${BUILD_DIR}/linux-custom/firmware/ppfe/* ${TARGET_DIR}/lib/firmware/
 cp -f ${BUILD_DIR}/linux-custom/br2-ucls1012a.its ${BINARIES_DIR}/

board/arcturus/aarch64-ucls1012a/readme.txt

@@ -24,13 +24,13 @@ After building, you should obtain this tree:
 
     output/images/
     +-- arc-ucls1012a.dtb
-    +-- Image.gz
+    +-- Image
     +-- part0-000000.itb
     +-- rootfs.cpio
     +-- rootfs.cpio.gz
     +-- rootfs.tar
     +-- u-boot.bin
-    +-- br2-ucls1012a.its
+    +-- ucls1012a.its
 
 Flashing
 --------

board/arcturus/aarch64-ucls1012a/rootfs_overlay/etc/init.d/S09modload

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+case "$1" in
+       start)
+                modprobe pfe
+                ;;
+        stop)
+                ;;
+        restart|reload)
+                ;;
+        *)
+                echo "Usage: $0 {start|stop|restart}"
+                exit 1
+esac

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

@@ -25,8 +25,6 @@ This guide covers the following configurations:
  - 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/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/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/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

@@ -11,6 +11,5 @@ image sdcard.img {
   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/imx8-bootloader-prepare.sh

@@ -9,49 +9,29 @@ main ()
 	fi
 
 	if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then
-		dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync
-		cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
-		if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" ${BR2_CONFIG}; then
-			BL31=${BINARIES_DIR}/bl31.bin BL32=${BINARIES_DIR}/tee.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin TEE_LOAD_ADDR=0xfe000000 ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
-		else
-			BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
-		fi
+		cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
+		BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
 		${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
 		rm -f ${BINARIES_DIR}/u-boot.its
 
 		${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
 	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MM=y$" ${BR2_CONFIG}; then
-		dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync
-		cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
-		if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" ${BR2_CONFIG}; then
-			BL31=${BINARIES_DIR}/bl31.bin BL32=${BINARIES_DIR}/tee.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin TEE_LOAD_ADDR=0xbe000000 ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
-		else
-			BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
-		fi
+		cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
+		BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00920000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
 		${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
 		rm -f ${BINARIES_DIR}/u-boot.its
 
 		${HOST_DIR}/bin/mkimage_imx8 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
 	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MN=y$" ${BR2_CONFIG}; then
-		dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync
-		cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
-		if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" ${BR2_CONFIG}; then
-			BL31=${BINARIES_DIR}/bl31.bin BL32=${BINARIES_DIR}/tee.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin TEE_LOAD_ADDR=0x56000000 ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
-		else
-			BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
-		fi
+		cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
+		BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00960000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
 		${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
 		rm -f ${BINARIES_DIR}/u-boot.its
 
 		${HOST_DIR}/bin/mkimage_imx8 -v v2 -fit -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x912000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin
 	elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8MP=y$" ${BR2_CONFIG}; then
-		dd if=${BINARIES_DIR}/u-boot-spl.bin of=${BINARIES_DIR}/u-boot-spl-padded.bin bs=4 conv=sync
-		cat ${BINARIES_DIR}/u-boot-spl-padded.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
-		if grep -Eq "^BR2_TARGET_OPTEE_OS=y$" ${BR2_CONFIG}; then
-			BL31=${BINARIES_DIR}/bl31.bin BL32=${BINARIES_DIR}/tee.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin TEE_LOAD_ADDR=0x56000000 ATF_LOAD_ADDR=0x00970000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
-		else
-			BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00970000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
-		fi
+		cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/ddr_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin
+		BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot-nodtb.bin ATF_LOAD_ADDR=0x00970000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its
 		${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb
 		rm -f ${BINARIES_DIR}/u-boot.its
 

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

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 {